Commit b79f5c96 authored by Kevin Deldycke's avatar Kevin Deldycke

support of inventory (in order to make getTotalInventory() method working)


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3328 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e5429db2
...@@ -14,6 +14,7 @@ getSourceUid ...@@ -14,6 +14,7 @@ getSourceUid
getDestinationUid getDestinationUid
getResourceUid getResourceUid
getNetConvertedQuantity getNetConvertedQuantity
getInventory
getStartDate getStartDate
getStopDate getStopDate
getNetConvertedTargetQuantity getNetConvertedTargetQuantity
...@@ -35,7 +36,7 @@ INSERT INTO movement VALUES ( ...@@ -35,7 +36,7 @@ INSERT INTO movement VALUES (
<dtml-if getDestinationUid ><dtml-sqlvar getDestinationUid type="int"><dtml-else>NULL</dtml-if>, <dtml-if getDestinationUid ><dtml-sqlvar getDestinationUid type="int"><dtml-else>NULL</dtml-if>,
<dtml-if getResourceUid><dtml-sqlvar getResourceUid type="int"><dtml-else>NULL</dtml-if>, <dtml-if getResourceUid><dtml-sqlvar getResourceUid type="int"><dtml-else>NULL</dtml-if>,
<dtml-if getNetConvertedQuantity><dtml-sqlvar getNetConvertedQuantity type="float"><dtml-else>NULL</dtml-if>, <dtml-if getNetConvertedQuantity><dtml-sqlvar getNetConvertedQuantity type="float"><dtml-else>NULL</dtml-if>,
NULL, <dtml-if getInventory><dtml-sqlvar getInventory type="float"><dtml-else>NULL</dtml-if>,
<dtml-if getStartDate><dtml-sqlvar getStartDate type="datetime"><dtml-else>NULL</dtml-if>, <dtml-if getStartDate><dtml-sqlvar getStartDate type="datetime"><dtml-else>NULL</dtml-if>,
<dtml-if getStopDate><dtml-sqlvar getStopDate type="datetime"><dtml-else>NULL</dtml-if>, <dtml-if getStopDate><dtml-sqlvar getStopDate type="datetime"><dtml-else>NULL</dtml-if>,
<dtml-if getNetConvertedTargetQuantity><dtml-sqlvar getNetConvertedTargetQuantity type="float"><dtml-else>NULL</dtml-if>, <dtml-if getNetConvertedTargetQuantity><dtml-sqlvar getNetConvertedTargetQuantity type="float"><dtml-else>NULL</dtml-if>,
......
...@@ -14,6 +14,7 @@ getSourceUid ...@@ -14,6 +14,7 @@ getSourceUid
getDestinationUid getDestinationUid
getResourceUid getResourceUid
getNetConvertedQuantity getNetConvertedQuantity
getInventory
getInventoriatedStartDate getInventoriatedStartDate
getInventoriatedStopDate getInventoriatedStopDate
getNetConvertedTargetQuantity getNetConvertedTargetQuantity
...@@ -39,14 +40,14 @@ INSERT INTO ...@@ -39,14 +40,14 @@ INSERT INTO
movement movement
VALUES VALUES
<dtml-in prefix="loop" expr="movement_list"> <dtml-in prefix="loop" expr="movement_list">
( (
<dtml-sqlvar expr="uid[loop_item]" type="int">, <dtml-sqlvar expr="uid[loop_item]" type="int">,
<dtml-sqlvar expr="getExplanationUid[loop_item]" type="int" optional>, <dtml-sqlvar expr="getExplanationUid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="getSourceUid[loop_item]" type="int" optional>, <dtml-sqlvar expr="getSourceUid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>, <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>, <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="getNetConvertedQuantity[loop_item]" type="float" optional>, <dtml-sqlvar expr="getNetConvertedQuantity[loop_item]" type="float" optional>,
NULL, <dtml-sqlvar expr="getInventory[loop_item]" type="float" optional>,
<dtml-sqlvar expr="getInventoriatedStartDate[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="getInventoriatedStartDate[loop_item]" type="datetime" optional>,
<dtml-sqlvar expr="getInventoriatedStopDate[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="getInventoriatedStopDate[loop_item]" type="datetime" optional>,
<dtml-sqlvar expr="getNetConvertedTargetQuantity[loop_item]" type="float" optional>, <dtml-sqlvar expr="getNetConvertedTargetQuantity[loop_item]" type="float" optional>,
......
...@@ -19,7 +19,7 @@ CREATE TABLE `movement` ( ...@@ -19,7 +19,7 @@ CREATE TABLE `movement` (
`destination_uid` BIGINT UNSIGNED default '0', `destination_uid` BIGINT UNSIGNED default '0',
`resource_uid` BIGINT UNSIGNED default '0', `resource_uid` BIGINT UNSIGNED default '0',
`quantity` real default '0.0', `quantity` real default '0.0',
`inventory` real default NULL, `inventory` real default '0.0',
`start_date` datetime, `start_date` datetime,
`stop_date` datetime, `stop_date` datetime,
`target_quantity` real default '0.0', `target_quantity` real default '0.0',
......
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