temporary branch
This commit is contained in:
@@ -10,9 +10,12 @@
|
||||
<many-to-one name="purchaseTax" ref="com.axelor.apps.account.db.Tax" title="Purchase Tax"/>
|
||||
<many-to-one name="saleTax" ref="com.axelor.apps.account.db.Tax" title="Sale Tax"/>
|
||||
<many-to-one name="tax" ref="com.axelor.apps.account.db.Tax" title="Tax"/>
|
||||
<many-to-one name="partner" ref="com.axelor.apps.base.db.Partner" title="Partner" />
|
||||
|
||||
<many-to-one name="product" ref="com.axelor.apps.base.db.Product" title="Product"/>
|
||||
<many-to-one name="productFamily" ref="com.axelor.apps.base.db.ProductFamily" title="Accounting family"/>
|
||||
|
||||
<finder-method name="findByProduct" using="product"/>
|
||||
|
||||
</entity>
|
||||
|
||||
|
||||
@@ -82,6 +82,9 @@
|
||||
|
||||
<boolean name="enableCheckTcoAccpeted" title="Enable check TCO Accepte" />
|
||||
|
||||
<!-- roq url -->
|
||||
<string name="roqURL" title="Roq URL" />
|
||||
|
||||
<extra-code>
|
||||
<![CDATA[
|
||||
public static final int DISCOUNT_SEPARATE = 1;
|
||||
|
||||
@@ -7,9 +7,12 @@
|
||||
|
||||
<entity name="CompanyDepartment" lang="java">
|
||||
|
||||
<string name="name" title="Name"/>
|
||||
<string name="code" title="Code"/>
|
||||
<many-to-one name="company" ref="com.axelor.apps.base.db.Company"/>
|
||||
<string name="name" title="Name"/>
|
||||
<string name="code" title="Code"/>
|
||||
<many-to-one name="company" ref="com.axelor.apps.base.db.Company"/>
|
||||
<integer name="departmentLevel" title="Level" />
|
||||
<many-to-one name="parentDepartment" ref="com.axelor.apps.base.db.CompanyDepartment"/>
|
||||
|
||||
|
||||
</entity>
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<string name="url" title="URL"/>
|
||||
<string name="subject" required="true" namecolumn="true" title="Subject"/>
|
||||
<string name="description" title="Description" large="true"/>
|
||||
<string name="decisions" title="Decisions" large="true"/>
|
||||
<string name="status" title="Status"/>
|
||||
<datetime name="startDateTime" required="true" title="Start date"/>
|
||||
<datetime name="endDateTime" required="true" title="End date"/>
|
||||
@@ -25,7 +26,10 @@
|
||||
<string name="subjectTeam"/>
|
||||
<integer name="typeSelect" title="Type" selection="icalendar.event.type.select" required="true" />
|
||||
<many-to-one name="user" column="user_id" ref="com.axelor.auth.db.User" title="Assigned to"/>
|
||||
<one-to-many name="companyDepartmentList" title="Company departments" ref="com.axelor.apps.base.db.CompanyDepartment" />
|
||||
|
||||
<finder-method name="findByUid" using="uid" />
|
||||
|
||||
|
||||
<extra-code>
|
||||
<![CDATA[
|
||||
|
||||
@@ -146,6 +146,10 @@
|
||||
<decimal name="pvg" title="PVG" />
|
||||
<decimal name="stklim" title="Stklim" />
|
||||
<decimal name="ug" title="UG" />
|
||||
|
||||
<boolean name="isDangerousProduct" title="Is dangerous" />
|
||||
|
||||
<finder-method name="findByCode" using="code" cacheable="true" />
|
||||
|
||||
<extra-code>
|
||||
<![CDATA[
|
||||
|
||||
@@ -45,6 +45,8 @@
|
||||
|
||||
<integer name="stepStatusSelect" selection="base.user.form.step.select" default="0"/>
|
||||
|
||||
<many-to-one name="companyDepartment" ref="com.axelor.apps.base.db.CompanyDepartment" />
|
||||
|
||||
<finder-method name="findByCode" using="code" filter="LOWER(self.code) = LOWER(:code)"/>
|
||||
|
||||
<track>
|
||||
|
||||
Reference in New Issue
Block a user