Commit 7ee0854a authored by Yoshinori Okuji's avatar Yoshinori Okuji

2005-12-14 yo

* Resource_zGetInventory and Resource_zGetInventoryList must use stock.mirror_node_uid instead of inventory_movement.destionation_uid.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4658 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1f008b65
...@@ -231,14 +231,14 @@ XXX How to deal with standardize ?\n ...@@ -231,14 +231,14 @@ XXX How to deal with standardize ?\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
OR stock.section_uid <> stock.mirror_section_uid\n OR stock.section_uid <> stock.mirror_section_uid\n
OR inventory_movement.destination_uid IS NULL\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
</dtml-if>\n </dtml-if>\n
<dtml-if omit_output>\n <dtml-if omit_output>\n
AND stock.quantity > 0\n AND stock.quantity > 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
OR stock.section_uid <> stock.mirror_section_uid\n OR stock.section_uid <> stock.mirror_section_uid\n
OR inventory_movement.destination_uid IS NULL\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
</dtml-if>\n </dtml-if>\n
\n \n
...@@ -369,14 +369,14 @@ XXX How to deal with standardize ?\n ...@@ -369,14 +369,14 @@ XXX How to deal with standardize ?\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
OR stock.section_uid <> stock.mirror_section_uid\n OR stock.section_uid <> stock.mirror_section_uid\n
OR inventory_movement.destination_uid IS NULL\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
</dtml-if>\n </dtml-if>\n
<dtml-if omit_output>\n <dtml-if omit_output>\n
AND stock.quantity > 0\n AND stock.quantity > 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
OR stock.section_uid <> stock.mirror_section_uid\n OR stock.section_uid <> stock.mirror_section_uid\n
OR inventory_movement.destination_uid IS NULL\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
</dtml-if>\n </dtml-if>\n
\n \n
......
...@@ -270,14 +270,14 @@ XXX How to deal with standardize ?\n ...@@ -270,14 +270,14 @@ XXX How to deal with standardize ?\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
OR stock.section_uid <> stock.mirror_section_uid\n OR stock.section_uid <> stock.mirror_section_uid\n
OR inventory_movement.destination_uid IS NULL\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
</dtml-if>\n </dtml-if>\n
<dtml-if omit_output>\n <dtml-if omit_output>\n
AND stock.quantity > 0\n AND stock.quantity > 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
OR stock.section_uid <> stock.mirror_section_uid\n OR stock.section_uid <> stock.mirror_section_uid\n
OR inventory_movement.destination_uid IS NULL\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
</dtml-if>\n </dtml-if>\n
\n \n
...@@ -410,14 +410,14 @@ XXX How to deal with standardize ?\n ...@@ -410,14 +410,14 @@ XXX How to deal with standardize ?\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
OR stock.section_uid <> stock.mirror_section_uid\n OR stock.section_uid <> stock.mirror_section_uid\n
OR inventory_movement.destination_uid IS NULL\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
</dtml-if>\n </dtml-if>\n
<dtml-if omit_output>\n <dtml-if omit_output>\n
AND stock.quantity > 0\n AND stock.quantity > 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
OR stock.section_uid <> stock.mirror_section_uid\n OR stock.section_uid <> stock.mirror_section_uid\n
OR inventory_movement.destination_uid IS NULL\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
</dtml-if>\n </dtml-if>\n
\n \n
......
...@@ -104,7 +104,7 @@ cwYAAABvYmplY3RzCQAAAGdldFBvcnRhbGMBAAAAAwAAAAMAAAADAAAAcxoAAAB0AACIAABkAQCD ...@@ -104,7 +104,7 @@ cwYAAABvYmplY3RzCQAAAGdldFBvcnRhbGMBAAAAAwAAAAMAAAADAAAAcxoAAAB0AACIAABkAQCD
AgBkAgCIAAAWfAAAgwIAUygDAAAATnMDAAAAbG9nczAAAABQcmVmZXJlbmNlV29ya2Zsb3cuZGlz AgBkAgCIAAAWfAAAgwIAUygDAAAATnMDAAAAbG9nczAAAABQcmVmZXJlbmNlV29ya2Zsb3cuZGlz
YWJsZU90aGVyUHJlZmVyZW5jZXMgb24gJXMoAwAAAHMJAAAAX2dldGF0dHJfcwQAAABwcmVmcwMA YWJsZU90aGVyUHJlZmVyZW5jZXMgb24gJXMoAwAAAHMJAAAAX2dldGF0dHJfcwQAAABwcmVmcwMA
AABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBAAAAHByZWYoAQAAAHMEAAAAcHJlZigA AABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBAAAAHByZWYoAQAAAHMEAAAAcHJlZigA
AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAAADxsYW1iZGEuNDU+BQAAAHMAAAAAcxIAAABwb3J0 AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAAADxsYW1iZGEuNTM+BQAAAHMAAAAAcxIAAABwb3J0
YWxfcHJlZmVyZW5jZXNzDAAAAHNlYXJjaEZvbGRlcnMEAAAAc3BlY3MPAAAARVJQNSBQcmVmZXJl YWxfcHJlZmVyZW5jZXNzDAAAAHNlYXJjaEZvbGRlcnMEAAAAc3BlY3MPAAAARVJQNSBQcmVmZXJl
bmNlcwkAAABnZXRPYmplY3RzEQAAAHBvcnRhbF9tZW1iZXJzaGlwcxYAAABnZXRBdXRoZW50aWNh bmNlcwkAAABnZXRPYmplY3RzEQAAAHBvcnRhbF9tZW1iZXJzaGlwcxYAAABnZXRBdXRoZW50aWNh
dGVkTWVtYmVycwcAAABhbGxvd2VkcwUAAABPd25lcnMIAAAAQXNzaWdub3JzEgAAAGdldFByZWZl dGVkTWVtYmVycwcAAABhbGxvd2VkcwUAAABPd25lcnMIAAAAQXNzaWdub3JzEgAAAGdldFByZWZl
......
2005-12-14 yo
* Resource_zGetInventory and Resource_zGetInventoryList must use stock.mirror_node_uid instead of inventory_movement.destionation_uid.
2005-12-14 aurel 2005-12-14 aurel
* fix naming convention * fix naming convention
* set default value of form_id in Base_cancel * set default value of form_id in Base_cancel
......
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