Skip to content
Snippets Groups Projects
Commit 4d534b29 authored by Mohamed Mansour's avatar Mohamed Mansour
Browse files

Belege: Removed unnecessary address field. Fixed Header and Footer

bugs.
parent 6b584bc0
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
<column name="NET" type="NUMERIC(14,2)"/> <column name="NET" type="NUMERIC(14,2)"/>
<column name="VAT" type="NUMERIC(14,2)"/> <column name="VAT" type="NUMERIC(14,2)"/>
<column name="CURRENCY" type="CHAR(36)"/> <column name="CURRENCY" type="CHAR(36)"/>
<column name="ADDRESS" type="NCLOB"/>
</createTable> </createTable>
</changeSet> </changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
...@@ -265,16 +265,6 @@ ...@@ -265,16 +265,6 @@
</entityParameter> </entityParameter>
</children> </children>
</entityConsumer> </entityConsumer>
<entityField>
<name>ADDRESS</name>
<contentType>LONG_TEXT</contentType>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/address/valueProcess.js</valueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityConsumer> <entityConsumer>
<name>KeywordCurrencies</name> <name>KeywordCurrencies</name>
<dependency> <dependency>
...@@ -324,12 +314,6 @@ ...@@ -324,12 +314,6 @@
<mandatory v="false" /> <mandatory v="false" />
<description>PARAMETER</description> <description>PARAMETER</description>
</entityParameter> </entityParameter>
<entityParameter>
<name>OrderAddress_param</name>
<expose v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer> <entityConsumer>
<name>Languages</name> <name>Languages</name>
<dependency> <dependency>
...@@ -1014,10 +998,6 @@ ...@@ -1014,10 +998,6 @@
<name>CONTACT_PERSON_ID.value</name> <name>CONTACT_PERSON_ID.value</name>
<recordfield>CONTACT.PERSON_ID</recordfield> <recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADDRESS.value</name>
<recordfield>SALESORDER.ADDRESS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping> <dbRecordFieldMapping>
<name>CURRENCY.displayValue</name> <name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression> <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
......
import("system.result");
import("system.vars");
if (vars.exists("$param.OrderAddress_param"))
{
result.string(vars.get("$param.OrderAddress_param"));
}
\ No newline at end of file
...@@ -4,6 +4,8 @@ import("system.neon"); ...@@ -4,6 +4,8 @@ import("system.neon");
import("system.db"); import("system.db");
import("system.util"); import("system.util");
if (vars.get("$this.value") == null)
{
if (vars.exists("$param.OrderFooter_param")) if (vars.exists("$param.OrderFooter_param"))
{ {
result.string(vars.get("$param.OrderFooter_param")); result.string(vars.get("$param.OrderFooter_param"));
...@@ -20,4 +22,5 @@ if (vars.get("$field.ChosenTexFooter") != "") ...@@ -20,4 +22,5 @@ if (vars.get("$field.ChosenTexFooter") != "")
{ {
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexFooter") + "'", "_____SYSTEMALIAS"); var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexFooter") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS"))); result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
} }
\ No newline at end of file
...@@ -4,6 +4,8 @@ import("system.neon"); ...@@ -4,6 +4,8 @@ import("system.neon");
import("system.db"); import("system.db");
import("system.util"); import("system.util");
if (vars.get("$this.value") == null)
{
if(vars.exists("$param.OrderHeader_param") && vars.get("$param.OrderHeader_param")) if(vars.exists("$param.OrderHeader_param") && vars.get("$param.OrderHeader_param"))
result.string(vars.get("$param.OrderHeader_param")); result.string(vars.get("$param.OrderHeader_param"));
...@@ -17,4 +19,5 @@ if (vars.get("$field.ChosenTexHeader") != "") ...@@ -17,4 +19,5 @@ if (vars.get("$field.ChosenTexHeader") != "")
{ {
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexHeader") + "'", "_____SYSTEMALIAS"); var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexHeader") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS"))); result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment