diff options
| -rw-r--r-- | insert_update_pricelist1.ktr | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/insert_update_pricelist1.ktr b/insert_update_pricelist1.ktr index 40778b0..ddcc7e4 100644 --- a/insert_update_pricelist1.ktr +++ b/insert_update_pricelist1.ktr @@ -443,8 +443,8 @@ <access>Native</access> <database>dw_bi_indoteknik</database> <port>5432</port> - <username>odoo</username> - <password>Encrypted 2be98afc82bdfd8dd9a2ca45acc83f6c3</password> + <username>metabase</username> + <password>Encrypted 2be98dfba28d7bf86853c9f58cfc4f889</password> <servername/> <data_tablespace/> <index_tablespace/> @@ -494,8 +494,8 @@ <access>Native</access> <database>erp_indoteknik</database> <port>5432</port> - <username>odoo</username> - <password>Encrypted 2be98afc82bdfd8dd9a2ca45acc83f6c3</password> + <username>metabase</username> + <password>Encrypted 2be98dfba28d7bf86853c9f58cfc4f889</password> <servername/> <data_tablespace/> <index_tablespace/> @@ -779,9 +779,21 @@ <compare> <condition> <negated>N</negated> - <leftvalue>disc_tier1</leftvalue> - <function><></function> - <rightvalue>price_discount</rightvalue> + <conditions> + <condition> + <negated>N</negated> + <leftvalue>disc_tier1</leftvalue> + <function><></function> + <rightvalue>price_discount</rightvalue> + </condition> + <condition> + <negated>N</negated> + <operator>OR</operator> + <leftvalue>price_tier1</leftvalue> + <function><></function> + <rightvalue>computed_price</rightvalue> + </condition> + </conditions> </condition> </compare> <attributes/> @@ -1817,7 +1829,7 @@ order by product_id</sql> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> <value-meta> - <type>Timestamp</type> + <type>Date</type> <storagetype>normal</storagetype> <name>date_start</name> <length>6</length> @@ -1840,7 +1852,7 @@ order by product_id</sql> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> <value-meta> - <type>Timestamp</type> + <type>Date</type> <storagetype>normal</storagetype> <name>date_end</name> <length>6</length> @@ -1955,7 +1967,7 @@ order by product_id</sql> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> <value-meta> - <type>Timestamp</type> + <type>Date</type> <storagetype>normal</storagetype> <name>create_date</name> <length>6</length> @@ -2001,7 +2013,7 @@ order by product_id</sql> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> <value-meta> - <type>Timestamp</type> + <type>Date</type> <storagetype>normal</storagetype> <name>write_date</name> <length>6</length> |