omit_input / omit_output was not working for movements using the same node,

same section but different payments.



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

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml

@@ -283,14 +283,16 @@ WHERE\n
   AND (  stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
   AND (  stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 \n
 <dtml-if input_simulation_state>\n
@@ -419,14 +421,16 @@ WHERE\n
   AND (  stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
   AND (  stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 \n
 <dtml-if input_simulation_state>\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml

@@ -146,20 +146,20 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>from_table_list</string>
-                            <string>where_expression</string>
-                            <string>order_by_expression</string>
-                            <string>group_by_expression</string>
-                            <string>selection_domain</string>
-                            <string>selection_report</string>
-                            <string>ignore_variation</string>
-                            <string>standardize</string>
-                            <string>omit_simulation</string>
-                            <string>section_filtered</string>
-                            <string>omit_input</string>
-                            <string>omit_output</string>
-                            <string>input_simulation_state</string>
-                            <string>output_simulation_state</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
+<string>group_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>ignore_variation</string>
+<string>standardize</string>
+<string>omit_simulation</string>
+<string>section_filtered</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>input_simulation_state</string>
+<string>output_simulation_state</string>
                           </list>
                         </value>
                     </item>
@@ -205,7 +205,9 @@ output_simulation_state:list</string> </value>
         </item>
         <item>
             <key> <string>connection_hook</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>connection_id</string> </key>
@@ -279,14 +281,16 @@ WHERE\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 \n
 <dtml-if input_simulation_state>\n
@@ -419,14 +423,16 @@ WHERE\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 \n
 <dtml-if input_simulation_state>\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml

@@ -156,23 +156,23 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>from_table_list</string>
-                            <string>where_expression</string>
-                            <string>order_by_expression</string>
-                            <string>group_by_expression</string>
-                            <string>selection_domain</string>
-                            <string>selection_report</string>
-                            <string>ignore_variation</string>
-                            <string>standardize</string>
-                            <string>omit_simulation</string>
-                            <string>omit_input</string>
-                            <string>omit_output</string>
-                            <string>section_filtered</string>
-                            <string>initial_running_total_quantity</string>
-                            <string>initial_running_total_price</string>
-                            <string>input_simulation_state</string>
-                            <string>output_simulation_state</string>
-                            <string>precision</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
+<string>group_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>ignore_variation</string>
+<string>standardize</string>
+<string>omit_simulation</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>section_filtered</string>
+<string>initial_running_total_quantity</string>
+<string>initial_running_total_price</string>
+<string>input_simulation_state</string>
+<string>output_simulation_state</string>
+<string>precision</string>
                           </list>
                         </value>
                     </item>
@@ -630,7 +630,9 @@ precision</string> </value>
         </item>
         <item>
             <key> <string>connection_hook</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>connection_id</string> </key>
@@ -717,14 +719,16 @@ WHERE\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 \n
 <dtml-if input_simulation_state>\n
@@ -873,14 +877,16 @@ WHERE\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR stock.mirror_node_uid IS NULL\n
-        OR stock.mirror_section_uid IS NULL )\n
+        OR stock.mirror_section_uid IS NULL\n
+        OR stock.payment_uid IS NOT NULL )\n
 </dtml-if>\n
 \n
 <dtml-if input_simulation_state>\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml

@@ -158,22 +158,22 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>query</string>
-                            <string>resource_uid</string>
-                            <string>from_date</string>
-                            <string>at_date</string>
-                            <string>to_date</string>
-                            <string>omit_simulation</string>
-                            <string>omit_input</string>
-                            <string>omit_output</string>
-                            <string>simulation_state</string>
-                            <string>section_category</string>
-                            <string>selection_domain</string>
-                            <string>selection_report</string>
-                            <string>closed_summary</string>
-                            <string>where_expression</string>
-                            <string>from_table_list</string>
-                            <string>selection_uids</string>
+<string>query</string>
+<string>resource_uid</string>
+<string>from_date</string>
+<string>at_date</string>
+<string>to_date</string>
+<string>omit_simulation</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>simulation_state</string>
+<string>section_category</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>closed_summary</string>
+<string>where_expression</string>
+<string>from_table_list</string>
+<string>selection_uids</string>
                           </list>
                         </value>
                     </item>
@@ -306,6 +306,7 @@ WHERE\n
      OR  stock.section_uid <> stock.mirror_section_uid\n
      OR  stock.mirror_node_uid IS NULL\n
      OR  stock.mirror_section_uid IS NULL\n
+     OR  stock.payment_uid IS NOT NULL\n
     )\n
   </dtml-if>\n
   <dtml-if omit_output>\n
@@ -314,6 +315,7 @@ WHERE\n
      OR  stock.section_uid <> stock.mirror_section_uid\n
      OR  stock.mirror_node_uid IS NULL\n
      OR  stock.mirror_section_uid IS NULL\n
+     OR  stock.payment_uid IS NOT NULL\n
     )\n
   </dtml-if>\n
   <dtml-if simulation_state>\n
@@ -449,6 +451,7 @@ WHERE\n
      OR  stock.section_uid <> stock.mirror_section_uid\n
      OR  stock.mirror_node_uid IS NULL\n
      OR  stock.mirror_section_uid IS NULL\n
+     OR  stock.payment_uid IS NOT NULL\n
     )\n
   </dtml-if>\n
   <dtml-if omit_output>\n
@@ -457,6 +460,7 @@ WHERE\n
      OR  stock.section_uid <> stock.mirror_section_uid\n
      OR  stock.mirror_node_uid IS NULL\n
      OR  stock.mirror_section_uid IS NULL\n
+     OR  stock.payment_uid IS NOT NULL\n
     )\n
   </dtml-if>\n
   <dtml-if simulation_state>\n

product/ERP5/bootstrap/erp5_core/bt/revision

-279
+280
\ No newline at end of file