Commit 125879b1 authored by Jérome Perrin's avatar Jérome Perrin

remove is_accountable stock table from stock, because we only insert movements...

remove is_accountable stock table from stock, because we only insert movements if they are accountable.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5583 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 59f9160b
...@@ -46,10 +46,10 @@ WHERE ...@@ -46,10 +46,10 @@ WHERE
<dtml-if "isAccountable[loop_item]"> <dtml-if "isAccountable[loop_item]">
<dtml-if "getResourceUid[loop_item]"> <dtml-if "getResourceUid[loop_item]">
<dtml-if "getDestinationUid[loop_item]"> <dtml-if "getDestinationUid[loop_item]">
<dtml-call expr="row_list.append([uid[loop_item], getDestinationUid[loop_item], getDestinationSectionUid[loop_item], getDestinationPaymentUid[loop_item], getDestinationFunctionUid[loop_item], getDestinationProjectUid[loop_item], getSourceSectionUid[loop_item], getSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item],getSubVariationText[loop_item]])"> <dtml-call expr="row_list.append([uid[loop_item], getDestinationUid[loop_item], getDestinationSectionUid[loop_item], getDestinationPaymentUid[loop_item], getDestinationFunctionUid[loop_item], getDestinationProjectUid[loop_item], getSourceSectionUid[loop_item], getSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item],getSubVariationText[loop_item]])">
</dtml-if> </dtml-if>
<dtml-if "getSourceUid[loop_item]"> <dtml-if "getSourceUid[loop_item]">
<dtml-call expr="row_list.append([uid[loop_item], getSourceUid[loop_item], getSourceSectionUid[loop_item], getSourcePaymentUid[loop_item], getSourceFunctionUid[loop_item], getSourceProjectUid[loop_item], getDestinationSectionUid[loop_item], getDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item], getSubVariationText[loop_item]])"> <dtml-call expr="row_list.append([uid[loop_item], getSourceUid[loop_item], getSourceSectionUid[loop_item], getSourcePaymentUid[loop_item], getSourceFunctionUid[loop_item], getSourceProjectUid[loop_item], getDestinationSectionUid[loop_item], getDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item], getSubVariationText[loop_item]])">
</dtml-if> </dtml-if>
</dtml-if> </dtml-if>
</dtml-if> </dtml-if>
...@@ -74,11 +74,10 @@ VALUES ...@@ -74,11 +74,10 @@ VALUES
<dtml-sqlvar expr="row_item[9]" type="float" optional>, <dtml-sqlvar expr="row_item[9]" type="float" optional>,
<dtml-sqlvar expr="row_item[10]" type="datetime" optional>, <dtml-sqlvar expr="row_item[10]" type="datetime" optional>,
<dtml-sqlvar expr="row_item[11]" type="float" optional>, <dtml-sqlvar expr="row_item[11]" type="float" optional>,
<dtml-sqlvar expr="row_item[12]" type="int" optional>, <dtml-sqlvar expr="row_item[12]" type="string" optional>,
<dtml-sqlvar expr="row_item[13]" type="string" optional>, <dtml-sqlvar expr="row_item[13]" type="string" optional>,
<dtml-sqlvar expr="row_item[14]" type="string" optional>, <dtml-sqlvar expr="row_item[14]" type="string" optional>,
<dtml-sqlvar expr="row_item[15]" type="string" optional>, <dtml-sqlvar expr="row_item[15]" type="string" optional>
<dtml-sqlvar expr="row_item[16]" type="string" optional>
) )
<dtml-if sequence-end><dtml-else>,</dtml-if> <dtml-if sequence-end><dtml-else>,</dtml-if>
</dtml-in> </dtml-in>
......
...@@ -25,7 +25,6 @@ CREATE TABLE `stock` ( ...@@ -25,7 +25,6 @@ CREATE TABLE `stock` (
`quantity` real , `quantity` real ,
`date` datetime, `date` datetime,
`total_price` real , `total_price` real ,
`is_accountable` bool,
`portal_type` VARCHAR(255), `portal_type` VARCHAR(255),
`simulation_state` varchar(255) default '', `simulation_state` varchar(255) default '',
`variation_text` VARCHAR(255), `variation_text` VARCHAR(255),
......
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