Skip to content
Snippets Groups Projects
Commit bd00341a authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

Merge origin/master

parents 3c0d18fd d134569b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
others/db_changes/struct/create_stock.xml 0 → 100644
+ 26
− 0
View file @ bd00341a
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="m.schroeger" id="1f68f308-a82d-4e68-82c0-aa2bb6e8a8f1">
<createTable tableName="STOCK">
<column name="STOCKID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_STOCK_STOCKID"/>
</column>
<column name="IN_OUT" type="INTEGER"/>
<column name="QUANTITY" type="NUMERIC(14,2)"/>
<column name="REFNUMBER" type="VARCHAR(50)"/>
<column name="PRODUCT_ID" type="CHAR(36)">
<constraints nullable="false" foreignKeyName="FK_STOCK_PRODUCT_ID" references="PRODUCT(PRODUCTID)"/>
</column>
<column name="ENTRYDATE" type="TIMESTAMP"/>
<column name="WAREHOUSE" type="INTEGER"/>
<column name="DATE_EDIT" type="TIMESTAMP"/>
<column name="DATE_NEW" type="TIMESTAMP">
<constraints nullable="false"/>
</column>
<column name="USER_EDIT" type="VARCHAR(50)"/>
<column name="USER_NEW" type="VARCHAR(50)">
<constraints nullable="false"/>
</column>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/struct/productChanges.xml 0 → 100644
+ 9
− 0
View file @ bd00341a
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="m.schroeger" id="9d7715ea-da67-4579-b591-ab4cd871e320">
<addUniqueConstraint tableName="PRODUCT" columnNames="PRODUCTCODE" constraintName="unique_PRODUCT_PRODUCTCODE"/>
<rollback>
<dropUniqueConstraint tableName="PRODUCT" constraintName="unique_PRODUCT_PRODUCTCODE"/>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
process/Date_lib/process.js
+ 5
− 1
View file @ bd00341a
import("system.translate");
/**
* provides methods for interactions with dates
*/
......@@ -15,5 +16,8 @@ function DateUtils(){
if (pStart == "" || pStart == null || pEnd == "" || pEnd == null) return null
return pStart <= pEnd;
}
this.getValidationFailString = function(){
return translate.text("The expiry date must be after the start date!");
}
}
\ No newline at end of file
process/Keyword_lib/process.js
+ 31
− 24
View file @ bd00341a
......@@ -123,51 +123,51 @@ function KeywordUtils(){
break;
case "CONTRACT.CONTRACTTYPE":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("0", translate.text("Rahmenvertrag"))
,createKeywordEntry("1", translate.text("Werksvertrag"))
,createKeywordEntry("2", translate.text("Wartungsvertrag"))
createKeywordEntry("0", translate.text("Framework contract"))
,createKeywordEntry("1", translate.text("Service contract"))
,createKeywordEntry("2", translate.text("Maintenance contract"))
]);
break;
case "CONTRACT.CONTRACTSTATUS":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("0", translate.text("gültig, unbefristet"))
,createKeywordEntry("1", translate.text("gültig, befristet"))
,createKeywordEntry("2", translate.text("noch nicht unterschrieben"))
,createKeywordEntry("3", translate.text("keiner, Einzelberechnung"))
,createKeywordEntry("4", translate.text("gekündigt"))
createKeywordEntry("0", translate.text("Valid, unlimited"))
,createKeywordEntry("1", translate.text("Valid, limited"))
,createKeywordEntry("2", translate.text("Not signed yet"))
,createKeywordEntry("3", translate.text("None, individual count"))
,createKeywordEntry("4", translate.text("Cancelled"))
]);
break;
case "CONTRACT.PAYMENT":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("0", translate.text("jährlich"))
,createKeywordEntry("1", translate.text("halbjährlich"))
,createKeywordEntry("2", translate.text("vierteljährlich"))
createKeywordEntry("0", translate.text("Annually"))
,createKeywordEntry("1", translate.text("Semiannually"))
,createKeywordEntry("2", translate.text("Quarterly"))
]);
break;
case "GROUPCODE":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("1", translate.text("Warengruppe 1"))
,createKeywordEntry("2", translate.text("Warengruppe 2"))
,createKeywordEntry("3", translate.text("Warengruppe 3"))
,createKeywordEntry("4", translate.text("Rabatt"))
,createKeywordEntry("5", translate.text("Ersatzteile"))
,createKeywordEntry("6", translate.text("Dienstleistung"))
createKeywordEntry("1", translate.text("Commodity group 1"))
,createKeywordEntry("2", translate.text("Commodity group 2"))
,createKeywordEntry("3", translate.text("Commodity group 3"))
,createKeywordEntry("4", translate.text("Discount"))
,createKeywordEntry("5", translate.text("Spare parts"))
,createKeywordEntry("6", translate.text("Service"))
]);
break;
case "UNIT":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("1", translate.text("Stück"))
,createKeywordEntry("2", translate.text("Kg"))
createKeywordEntry("1", translate.text("Pieces"))
,createKeywordEntry("2", translate.text("Kgs"))
,createKeywordEntry("3", translate.text("Liter"))
,createKeywordEntry("4", translate.text("Stunden"))
,createKeywordEntry("4", translate.text("Hours"))
]);
break;
case "PRICELIST":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("1", translate.text("Standard"))
,createKeywordEntry("2", translate.text("Großkunde"))
,createKeywordEntry("3", translate.text("Sonderpreisliste1"))
,createKeywordEntry("4", translate.text("Service"))
createKeywordEntry("1", translate.text("${PRICELIST_DEFAULT}"))
,createKeywordEntry("2", translate.text("Key account"))
,createKeywordEntry("3", translate.text("Special price list1"))
,createKeywordEntry("4", translate.text("${PRICELIST_SERVICE}"))
]);
break;
case "CURRENCY":
......@@ -178,6 +178,13 @@ function KeywordUtils(){
,createKeywordEntry("4", translate.text("CHF"))
]);
break;
case "STOCK.WAREHOUSE":
valueContainer = createKeywordEntriesContainer([
createKeywordEntry("1", translate.text("Warehouse 1"))
,createKeywordEntry("2", translate.text("Warehouse 2"))
,createKeywordEntry("3", translate.text("Warehouse 3"))
]);
break;
default:
throw new Error(translate.withArguments("[%0]the given keyword \"%1\" has no match with the possible keywordlist", [
arguments.callee.name, keywordType
......
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