Skip to content

I
iBiz商业中心
提交 9f40f2c6 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 发布系统代码 [Spring Boot]

上级 b27861ad
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 111 行增加 和 297 行删除
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/domain/Account_bank_statement_import_journal_creation.java
浏览文件 @ 9f40f2c6
...@@ -189,13 +189,6 @@ public class Account_bank_statement_import_journal_creation extends EntityMP imp ...@@ -189,13 +189,6 @@ public class Account_bank_statement_import_journal_creation extends EntityMP imp
@JSONField(name = "profit_account_id") @JSONField(name = "profit_account_id")
@JsonProperty("profit_account_id") @JsonProperty("profit_account_id")
private Long profitAccountId; private Long profitAccountId;
/**
* 允许取消分录
*/
@TableField(exist = false)
@JSONField(name = "update_posted")
@JsonProperty("update_posted")
private Boolean updatePosted;
/** /**
* 信用票：下一号码 * 信用票：下一号码
*/ */
...@@ -217,13 +210,6 @@ public class Account_bank_statement_import_journal_creation extends EntityMP imp ...@@ -217,13 +210,6 @@ public class Account_bank_statement_import_journal_creation extends EntityMP imp
@JSONField(name = "code") @JSONField(name = "code")
@JsonProperty("code") @JsonProperty("code")
private String code; private String code;
/**
* 分组发票明细行
*/
@TableField(exist = false)
@JSONField(name = "group_invoice_lines")
@JsonProperty("group_invoice_lines")
private Boolean groupInvoiceLines;
/** /**
* 供应商账单的别名 * 供应商账单的别名
*/ */
...@@ -329,13 +315,6 @@ public class Account_bank_statement_import_journal_creation extends EntityMP imp ...@@ -329,13 +315,6 @@ public class Account_bank_statement_import_journal_creation extends EntityMP imp
@JSONField(name = "show_on_dashboard") @JSONField(name = "show_on_dashboard")
@JsonProperty("show_on_dashboard") @JsonProperty("show_on_dashboard")
private Boolean showOnDashboard; private Boolean showOnDashboard;
/**
* 银行核销时过账
*/
@TableField(exist = false)
@JSONField(name = "post_at_bank_rec")
@JsonProperty("post_at_bank_rec")
private Boolean postAtBankRec;
/** /**
* 属于用户的当前公司 * 属于用户的当前公司
*/ */
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/domain/Account_journal.java
浏览文件 @ 9f40f2c6
...@@ -97,14 +97,6 @@ public class Account_journal extends EntityMP implements Serializable { ...@@ -97,14 +97,6 @@ public class Account_journal extends EntityMP implements Serializable {
@JSONField(name = "show_on_dashboard") @JSONField(name = "show_on_dashboard")
@JsonProperty("show_on_dashboard") @JsonProperty("show_on_dashboard")
private Boolean showOnDashboard; private Boolean showOnDashboard;
/**
* 在销售点中使用
*/
@DEField(name = "journal_user")
@TableField(value = "journal_user")
@JSONField(name = "journal_user")
@JsonProperty("journal_user")
private Boolean journalUser;
/** /**
* ID * ID
*/ */
...@@ -129,14 +121,6 @@ public class Account_journal extends EntityMP implements Serializable { ...@@ -129,14 +121,6 @@ public class Account_journal extends EntityMP implements Serializable {
@JSONField(name = "at_least_one_inbound") @JSONField(name = "at_least_one_inbound")
@JsonProperty("at_least_one_inbound") @JsonProperty("at_least_one_inbound")
private Boolean atLeastOneInbound; private Boolean atLeastOneInbound;
/**
* 银行核销时过账
*/
@DEField(name = "post_at_bank_rec")
@TableField(value = "post_at_bank_rec")
@JSONField(name = "post_at_bank_rec")
@JsonProperty("post_at_bank_rec")
private Boolean postAtBankRec;
/** /**
* 日记账名称 * 日记账名称
*/ */
...@@ -196,14 +180,6 @@ public class Account_journal extends EntityMP implements Serializable { ...@@ -196,14 +180,6 @@ public class Account_journal extends EntityMP implements Serializable {
@JSONField(name = "__last_update" , format="yyyy-MM-dd HH:mm:ss") @JSONField(name = "__last_update" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("__last_update") @JsonProperty("__last_update")
private Timestamp LastUpdate; private Timestamp LastUpdate;
/**
* 分组发票明细行
*/
@DEField(name = "group_invoice_lines")
@TableField(value = "group_invoice_lines")
@JSONField(name = "group_invoice_lines")
@JsonProperty("group_invoice_lines")
private Boolean groupInvoiceLines;
/** /**
* 信用票分录序列 * 信用票分录序列
*/ */
...@@ -226,14 +202,6 @@ public class Account_journal extends EntityMP implements Serializable { ...@@ -226,14 +202,6 @@ public class Account_journal extends EntityMP implements Serializable {
@JSONField(name = "account_control_ids") @JSONField(name = "account_control_ids")
@JsonProperty("account_control_ids") @JsonProperty("account_control_ids")
private String accountControlIds; private String accountControlIds;
/**
* 允许取消分录
*/
@DEField(name = "update_posted")
@TableField(value = "update_posted")
@JSONField(name = "update_posted")
@JsonProperty("update_posted")
private Boolean updatePosted;
/** /**
* 看板仪表板图表 * 看板仪表板图表
*/ */
...@@ -563,14 +531,6 @@ public class Account_journal extends EntityMP implements Serializable { ...@@ -563,14 +531,6 @@ public class Account_journal extends EntityMP implements Serializable {
this.modify("show_on_dashboard",showOnDashboard); this.modify("show_on_dashboard",showOnDashboard);
} }
/**
* 设置 [在销售点中使用]
*/
public void setJournalUser(Boolean journalUser){
this.journalUser = journalUser ;
this.modify("journal_user",journalUser);
}
/** /**
* 设置 [银行费用] * 设置 [银行费用]
*/ */
...@@ -587,14 +547,6 @@ public class Account_journal extends EntityMP implements Serializable { ...@@ -587,14 +547,6 @@ public class Account_journal extends EntityMP implements Serializable {
this.modify("at_least_one_inbound",atLeastOneInbound); this.modify("at_least_one_inbound",atLeastOneInbound);
} }
/**
* 设置 [银行核销时过账]
*/
public void setPostAtBankRec(Boolean postAtBankRec){
this.postAtBankRec = postAtBankRec ;
this.modify("post_at_bank_rec",postAtBankRec);
}
/** /**
* 设置 [日记账名称] * 设置 [日记账名称]
*/ */
...@@ -611,14 +563,6 @@ public class Account_journal extends EntityMP implements Serializable { ...@@ -611,14 +563,6 @@ public class Account_journal extends EntityMP implements Serializable {
this.modify("code",code); this.modify("code",code);
} }
/**
* 设置 [分组发票明细行]
*/
public void setGroupInvoiceLines(Boolean groupInvoiceLines){
this.groupInvoiceLines = groupInvoiceLines ;
this.modify("group_invoice_lines",groupInvoiceLines);
}
/** /**
* 设置 [信用票分录序列] * 设置 [信用票分录序列]
*/ */
...@@ -627,14 +571,6 @@ public class Account_journal extends EntityMP implements Serializable { ...@@ -627,14 +571,6 @@ public class Account_journal extends EntityMP implements Serializable {
this.modify("refund_sequence_id",refundSequenceId); this.modify("refund_sequence_id",refundSequenceId);
} }
/**
* 设置 [允许取消分录]
*/
public void setUpdatePosted(Boolean updatePosted){
this.updatePosted = updatePosted ;
this.modify("update_posted",updatePosted);
}
/** /**
* 设置 [类型] * 设置 [类型]
*/ */
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/service/impl/Account_bank_statement_import_journal_creationServiceImpl.java
浏览文件 @ 9f40f2c6
...@@ -262,11 +262,9 @@ public class Account_bank_statement_import_journal_creationServiceImpl extends E ...@@ -262,11 +262,9 @@ public class Account_bank_statement_import_journal_creationServiceImpl extends E
et.setRefundSequence(odooJournal.getRefundSequence()); et.setRefundSequence(odooJournal.getRefundSequence());
et.setAtLeastOneOutbound(odooJournal.getAtLeastOneOutbound()); et.setAtLeastOneOutbound(odooJournal.getAtLeastOneOutbound());
et.setProfitAccountId(odooJournal.getProfitAccountId()); et.setProfitAccountId(odooJournal.getProfitAccountId());
et.setUpdatePosted(odooJournal.getUpdatePosted());
et.setRefundSequenceNumberNext(odooJournal.getRefundSequenceNumberNext()); et.setRefundSequenceNumberNext(odooJournal.getRefundSequenceNumberNext());
et.setAliasId(odooJournal.getAliasId()); et.setAliasId(odooJournal.getAliasId());
et.setCode(odooJournal.getCode()); et.setCode(odooJournal.getCode());
et.setGroupInvoiceLines(odooJournal.getGroupInvoiceLines());
et.setAliasName(odooJournal.getAliasName()); et.setAliasName(odooJournal.getAliasName());
et.setBankAccountId(odooJournal.getBankAccountId()); et.setBankAccountId(odooJournal.getBankAccountId());
et.setColor(odooJournal.getColor()); et.setColor(odooJournal.getColor());
...@@ -281,7 +279,6 @@ public class Account_bank_statement_import_journal_creationServiceImpl extends E ...@@ -281,7 +279,6 @@ public class Account_bank_statement_import_journal_creationServiceImpl extends E
et.setKanbanDashboard(odooJournal.getKanbanDashboard()); et.setKanbanDashboard(odooJournal.getKanbanDashboard());
et.setKanbanDashboardGraph(odooJournal.getKanbanDashboardGraph()); et.setKanbanDashboardGraph(odooJournal.getKanbanDashboardGraph());
et.setShowOnDashboard(odooJournal.getShowOnDashboard()); et.setShowOnDashboard(odooJournal.getShowOnDashboard());
et.setPostAtBankRec(odooJournal.getPostAtBankRec());
et.setBelongsToCompany(odooJournal.getBelongsToCompany()); et.setBelongsToCompany(odooJournal.getBelongsToCompany());
et.setName(odooJournal.getName()); et.setName(odooJournal.getName());
et.setType(odooJournal.getType()); et.setType(odooJournal.getType());
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_usersServiceImpl.java
浏览文件 @ 9f40f2c6
...@@ -491,10 +491,10 @@ public class Res_usersServiceImpl extends EBSServiceImpl<Res_usersMapper, Res_us ...@@ -491,10 +491,10 @@ public class Res_usersServiceImpl extends EBSServiceImpl<Res_usersMapper, Res_us
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_categoryService hrEmployeeCategoryService; protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_categoryService hrEmployeeCategoryService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_skillService hrEmployeeSkillService; protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employeeService hrEmployeeService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employeeService hrEmployeeService; protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_skillService hrEmployeeSkillService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_expense_refuse_wizardService hrExpenseRefuseWizardService; protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_expense_refuse_wizardService hrExpenseRefuseWizardService;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_employee.java
浏览文件 @ 9f40f2c6
...@@ -906,6 +906,22 @@ public class Hr_employee extends EntityMP implements Serializable { ...@@ -906,6 +906,22 @@ public class Hr_employee extends EntityMP implements Serializable {
@JSONField(name = "resource_calendar_id") @JSONField(name = "resource_calendar_id")
@JsonProperty("resource_calendar_id") @JsonProperty("resource_calendar_id")
private Long resourceCalendarId; private Long resourceCalendarId;
/**
* ID
*/
@DEField(name = "leave_manager_id")
@TableField(value = "leave_manager_id")
@JSONField(name = "leave_manager_id")
@JsonProperty("leave_manager_id")
private Long leaveManagerId;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooLeaveManager;
/** /**
* *
...@@ -1469,6 +1485,14 @@ public class Hr_employee extends EntityMP implements Serializable { ...@@ -1469,6 +1485,14 @@ public class Hr_employee extends EntityMP implements Serializable {
this.modify("resource_calendar_id",resourceCalendarId); this.modify("resource_calendar_id",resourceCalendarId);
} }
/**
* 设置 [ID]
*/
public void setLeaveManagerId(Long leaveManagerId){
this.leaveManagerId = leaveManagerId ;
this.modify("leave_manager_id",leaveManagerId);
}
@Override @Override
public Serializable getDefaultKey(boolean gen) { public Serializable getDefaultKey(boolean gen) {
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/filter/Hr_employeeSearchContext.java
浏览文件 @ 9f40f2c6
...@@ -398,6 +398,13 @@ public class Hr_employeeSearchContext extends QueryWrapperContext<Hr_employee> { ...@@ -398,6 +398,13 @@ public class Hr_employeeSearchContext extends QueryWrapperContext<Hr_employee> {
this.getSearchCond().eq("resource_calendar_id", n_resource_calendar_id_eq); this.getSearchCond().eq("resource_calendar_id", n_resource_calendar_id_eq);
} }
} }
private Long n_leave_manager_id_eq;//[ID]
public void setN_leave_manager_id_eq(Long n_leave_manager_id_eq) {
this.n_leave_manager_id_eq = n_leave_manager_id_eq;
if(!ObjectUtils.isEmpty(this.n_leave_manager_id_eq)){
this.getSearchCond().eq("leave_manager_id", n_leave_manager_id_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_employeeMapper.java
浏览文件 @ 9f40f2c6
...@@ -62,6 +62,8 @@ public interface Hr_employeeMapper extends BaseMapper<Hr_employee>{ ...@@ -62,6 +62,8 @@ public interface Hr_employeeMapper extends BaseMapper<Hr_employee>{
@Delete("${sql}") @Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param); boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<Hr_employee> selectByLeaveManagerId(@Param("id") Serializable id) ;
List<Hr_employee> selectByLastAttendanceId(@Param("id") Serializable id) ; List<Hr_employee> selectByLastAttendanceId(@Param("id") Serializable id) ;
List<Hr_employee> selectByDepartmentId(@Param("id") Serializable id) ; List<Hr_employee> selectByDepartmentId(@Param("id") Serializable id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/IHr_employeeService.java
浏览文件 @ 9f40f2c6
...@@ -37,6 +37,8 @@ public interface IHr_employeeService extends IService<Hr_employee>{ ...@@ -37,6 +37,8 @@ public interface IHr_employeeService extends IService<Hr_employee>{
boolean save(Hr_employee et) ; boolean save(Hr_employee et) ;
void saveBatch(List<Hr_employee> list) ; void saveBatch(List<Hr_employee> list) ;
Page<Hr_employee> searchDefault(Hr_employeeSearchContext context) ; Page<Hr_employee> searchDefault(Hr_employeeSearchContext context) ;
List<Hr_employee> selectByLeaveManagerId(Long id);
void removeByLeaveManagerId(Long id);
List<Hr_employee> selectByLastAttendanceId(Long id); List<Hr_employee> selectByLastAttendanceId(Long id);
void resetByLastAttendanceId(Long id); void resetByLastAttendanceId(Long id);
void resetByLastAttendanceId(Collection<Long> ids); void resetByLastAttendanceId(Collection<Long> ids);
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_employeeServiceImpl.java
浏览文件 @ 9f40f2c6
...@@ -103,6 +103,9 @@ public class Hr_employeeServiceImpl extends EBSServiceImpl<Hr_employeeMapper, Hr ...@@ -103,6 +103,9 @@ public class Hr_employeeServiceImpl extends EBSServiceImpl<Hr_employeeMapper, Hr
protected cn.ibizlab.businesscentral.core.odoo_maintenance.service.IMaintenance_requestService maintenanceRequestService; protected cn.ibizlab.businesscentral.core.odoo_maintenance.service.IMaintenance_requestService maintenanceRequestService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_resource.service.IResource_calendarService resourceCalendarService; protected cn.ibizlab.businesscentral.core.odoo_resource.service.IResource_calendarService resourceCalendarService;
@Autowired @Autowired
@Lazy @Lazy
...@@ -119,9 +122,6 @@ public class Hr_employeeServiceImpl extends EBSServiceImpl<Hr_employeeMapper, Hr ...@@ -119,9 +122,6 @@ public class Hr_employeeServiceImpl extends EBSServiceImpl<Hr_employeeMapper, Hr
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService; protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
protected int batchSize = 500; protected int batchSize = 500;
...@@ -302,6 +302,15 @@ public class Hr_employeeServiceImpl extends EBSServiceImpl<Hr_employeeMapper, Hr ...@@ -302,6 +302,15 @@ public class Hr_employeeServiceImpl extends EBSServiceImpl<Hr_employeeMapper, Hr
} }
@Override
public List<Hr_employee> selectByLeaveManagerId(Long id) {
return baseMapper.selectByLeaveManagerId(id);
}
@Override
public void removeByLeaveManagerId(Long id) {
this.remove(new QueryWrapper<Hr_employee>().eq("leave_manager_id",id));
}
@Override @Override
public List<Hr_employee> selectByLastAttendanceId(Long id) { public List<Hr_employee> selectByLastAttendanceId(Long id) {
return baseMapper.selectByLastAttendanceId(id); return baseMapper.selectByLastAttendanceId(id);
......
businesscentral-core/src/main/resources/mapper/odoo_account/account_bank_statement_import_journal_creation/Account_bank_statement_import_journal_creationMapper.xml
浏览文件 @ 9f40f2c6
...@@ -29,10 +29,8 @@ ...@@ -29,10 +29,8 @@
<result property="refundSequence" column="refund_sequence" /> <result property="refundSequence" column="refund_sequence" />
<result property="atLeastOneOutbound" column="at_least_one_outbound" /> <result property="atLeastOneOutbound" column="at_least_one_outbound" />
<result property="profitAccountId" column="profit_account_id" /> <result property="profitAccountId" column="profit_account_id" />
<result property="updatePosted" column="update_posted" />
<result property="refundSequenceNumberNext" column="refund_sequence_number_next" /> <result property="refundSequenceNumberNext" column="refund_sequence_number_next" />
<result property="aliasId" column="alias_id" /> <result property="aliasId" column="alias_id" />
<result property="groupInvoiceLines" column="group_invoice_lines" />
<result property="aliasName" column="alias_name" /> <result property="aliasName" column="alias_name" />
<result property="bankAccountId" column="bank_account_id" /> <result property="bankAccountId" column="bank_account_id" />
<result property="atLeastOneInbound" column="at_least_one_inbound" /> <result property="atLeastOneInbound" column="at_least_one_inbound" />
...@@ -46,7 +44,6 @@ ...@@ -46,7 +44,6 @@
<result property="kanbanDashboard" column="kanban_dashboard" /> <result property="kanbanDashboard" column="kanban_dashboard" />
<result property="kanbanDashboardGraph" column="kanban_dashboard_graph" /> <result property="kanbanDashboardGraph" column="kanban_dashboard_graph" />
<result property="showOnDashboard" column="show_on_dashboard" /> <result property="showOnDashboard" column="show_on_dashboard" />
<result property="postAtBankRec" column="post_at_bank_rec" />
<result property="belongsToCompany" column="belongs_to_company" /> <result property="belongsToCompany" column="belongs_to_company" />
<result property="sequenceId" column="sequence_id" /> <result property="sequenceId" column="sequence_id" />
<result property="createUid" column="create_uid" /> <result property="createUid" column="create_uid" />
......
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @ 9f40f2c6
...@@ -6129,23 +6129,6 @@ ...@@ -6129,23 +6129,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"UPDATE_POSTED" ,
"codename":"Update_posted",
"field_logic_name":"允许取消分录",
"entity_name":"Account_bank_statement_import_journal_creation",
"ref_de":"ACCOUNT_JOURNAL",
"ref_field_name":"UPDATE_POSTED",
"relation_name":"DER1N_ACCOUNT_BANK_STATEMENT_IMPORT_JOURNAL_CREATION__ACCOUNT_JOURNAL__JOURNAL_ID",
"relation_codename":"Odoo_journal",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"REFUND_SEQUENCE_NUMBER_NEXT" , "fieldname":"REFUND_SEQUENCE_NUMBER_NEXT" ,
"codename":"Refund_sequence_number_next", "codename":"Refund_sequence_number_next",
"field_logic_name":"信用票：下一号码", "field_logic_name":"信用票：下一号码",
...@@ -6198,23 +6181,6 @@ ...@@ -6198,23 +6181,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"GROUP_INVOICE_LINES" ,
"codename":"Group_invoice_lines",
"field_logic_name":"分组发票明细行",
"entity_name":"Account_bank_statement_import_journal_creation",
"ref_de":"ACCOUNT_JOURNAL",
"ref_field_name":"GROUP_INVOICE_LINES",
"relation_name":"DER1N_ACCOUNT_BANK_STATEMENT_IMPORT_JOURNAL_CREATION__ACCOUNT_JOURNAL__JOURNAL_ID",
"relation_codename":"Odoo_journal",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"ALIAS_NAME" , "fieldname":"ALIAS_NAME" ,
"codename":"Alias_name", "codename":"Alias_name",
"field_logic_name":"供应商账单的别名", "field_logic_name":"供应商账单的别名",
...@@ -6477,23 +6443,6 @@ ...@@ -6477,23 +6443,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"POST_AT_BANK_REC" ,
"codename":"Post_at_bank_rec",
"field_logic_name":"银行核销时过账",
"entity_name":"Account_bank_statement_import_journal_creation",
"ref_de":"ACCOUNT_JOURNAL",
"ref_field_name":"POST_AT_BANK_REC",
"relation_name":"DER1N_ACCOUNT_BANK_STATEMENT_IMPORT_JOURNAL_CREATION__ACCOUNT_JOURNAL__JOURNAL_ID",
"relation_codename":"Odoo_journal",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"BELONGS_TO_COMPANY" , "fieldname":"BELONGS_TO_COMPANY" ,
"codename":"Belongs_to_company", "codename":"Belongs_to_company",
"field_logic_name":"属于用户的当前公司", "field_logic_name":"属于用户的当前公司",
...@@ -18818,19 +18767,6 @@ ...@@ -18818,19 +18767,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"JOURNAL_USER" ,
"codename":"Journal_user",
"field_logic_name":"在销售点中使用",
"entity_name":"Account_journal",
"field_type":"TRUEFALSE",
"nullable":1,
"physical_field":1,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"ID" , "fieldname":"ID" ,
"codename":"Id", "codename":"Id",
"field_logic_name":"ID", "field_logic_name":"ID",
...@@ -18872,19 +18808,6 @@ ...@@ -18872,19 +18808,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"POST_AT_BANK_REC" ,
"codename":"Post_at_bank_rec",
"field_logic_name":"银行核销时过账",
"entity_name":"Account_journal",
"field_type":"TRUEFALSE",
"nullable":1,
"physical_field":1,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"NAME" , "fieldname":"NAME" ,
"codename":"Name", "codename":"Name",
"field_logic_name":"日记账名称", "field_logic_name":"日记账名称",
...@@ -18994,19 +18917,6 @@ ...@@ -18994,19 +18917,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"GROUP_INVOICE_LINES" ,
"codename":"Group_invoice_lines",
"field_logic_name":"分组发票明细行",
"entity_name":"Account_journal",
"field_type":"TRUEFALSE",
"nullable":1,
"physical_field":1,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"REFUND_SEQUENCE_ID" , "fieldname":"REFUND_SEQUENCE_ID" ,
"codename":"Refund_sequence_id", "codename":"Refund_sequence_id",
"field_logic_name":"信用票分录序列", "field_logic_name":"信用票分录序列",
...@@ -19048,19 +18958,6 @@ ...@@ -19048,19 +18958,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"UPDATE_POSTED" ,
"codename":"Update_posted",
"field_logic_name":"允许取消分录",
"entity_name":"Account_journal",
"field_type":"TRUEFALSE",
"nullable":1,
"physical_field":1,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"KANBAN_DASHBOARD_GRAPH" , "fieldname":"KANBAN_DASHBOARD_GRAPH" ,
"codename":"Kanban_dashboard_graph", "codename":"Kanban_dashboard_graph",
"field_logic_name":"看板仪表板图表", "field_logic_name":"看板仪表板图表",
...@@ -65866,6 +65763,23 @@ ...@@ -65866,6 +65763,23 @@
"key_field":0, "key_field":0,
"show_order":1000, "show_order":1000,
"major_field":0 "major_field":0
},
{
"fieldname":"LEAVE_MANAGER_ID" ,
"codename":"Leave_manager_id",
"field_logic_name":"ID",
"entity_name":"Hr_employee",
"ref_de":"RES_USERS",
"ref_field_name":"ID",
"relation_name":"DER1N_HR_EMPLOYEE_RES_USERS_LEAVE_MANAGER_ID",
"relation_codename":"Odoo_leave_manager",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"show_order":1000,
"major_field":0
} }
], ],
"subEntitys":[ "subEntitys":[
...@@ -66009,6 +65923,12 @@ ...@@ -66009,6 +65923,12 @@
} }
], ],
"parentEntitys":[ "parentEntitys":[
{"name":"DER1N_HR_EMPLOYEE_RES_USERS_LEAVE_MANAGER_ID",
"relation_type":"DER1N",
"code_name":"Odoo_leave_manager",
"entity_name":"HR_EMPLOYEE",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_HR_EMPLOYEE__HR_ATTENDANCE__LAST_ATTENDANCE_ID", {"name":"DER1N_HR_EMPLOYEE__HR_ATTENDANCE__LAST_ATTENDANCE_ID",
"relation_type":"DER1N", "relation_type":"DER1N",
"code_name":"Odoo_last_attendance", "code_name":"Odoo_last_attendance",
...@@ -158600,6 +158520,12 @@ ...@@ -158600,6 +158520,12 @@
"entity_name":"HR_EMPLOYEE_CATEGORY", "entity_name":"HR_EMPLOYEE_CATEGORY",
"ref_entity_name":"RES_USERS" "ref_entity_name":"RES_USERS"
}, },
{"name":"DER1N_HR_EMPLOYEE_RES_USERS_LEAVE_MANAGER_ID",
"relation_type":"DER1N",
"code_name":"Odoo_leave_manager",
"entity_name":"HR_EMPLOYEE",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_HR_EMPLOYEE_SKILL_RES_USERS_CREATE_UID", {"name":"DER1N_HR_EMPLOYEE_SKILL_RES_USERS_CREATE_UID",
"relation_type":"DER1N", "relation_type":"DER1N",
"code_name":"Odoo_create", "code_name":"Odoo_create",
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Account_bank_statement_import_journal_creationDTO.java
浏览文件 @ 9f40f2c6
...@@ -205,14 +205,6 @@ public class Account_bank_statement_import_journal_creationDTO extends DTOBase i ...@@ -205,14 +205,6 @@ public class Account_bank_statement_import_journal_creationDTO extends DTOBase i
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long profitAccountId; private Long profitAccountId;
/**
* 属性 [UPDATE_POSTED]
*
*/
@JSONField(name = "update_posted")
@JsonProperty("update_posted")
private Boolean updatePosted;
/** /**
* 属性 [REFUND_SEQUENCE_NUMBER_NEXT] * 属性 [REFUND_SEQUENCE_NUMBER_NEXT]
* *
...@@ -240,14 +232,6 @@ public class Account_bank_statement_import_journal_creationDTO extends DTOBase i ...@@ -240,14 +232,6 @@ public class Account_bank_statement_import_journal_creationDTO extends DTOBase i
@Size(min = 0, max = 5, message = "内容长度必须小于等于[5]") @Size(min = 0, max = 5, message = "内容长度必须小于等于[5]")
private String code; private String code;
/**
* 属性 [GROUP_INVOICE_LINES]
*
*/
@JSONField(name = "group_invoice_lines")
@JsonProperty("group_invoice_lines")
private Boolean groupInvoiceLines;
/** /**
* 属性 [ALIAS_NAME] * 属性 [ALIAS_NAME]
* *
...@@ -379,14 +363,6 @@ public class Account_bank_statement_import_journal_creationDTO extends DTOBase i ...@@ -379,14 +363,6 @@ public class Account_bank_statement_import_journal_creationDTO extends DTOBase i
@JsonProperty("show_on_dashboard") @JsonProperty("show_on_dashboard")
private Boolean showOnDashboard; private Boolean showOnDashboard;
/**
* 属性 [POST_AT_BANK_REC]
*
*/
@JSONField(name = "post_at_bank_rec")
@JsonProperty("post_at_bank_rec")
private Boolean postAtBankRec;
/** /**
* 属性 [BELONGS_TO_COMPANY] * 属性 [BELONGS_TO_COMPANY]
* *
......
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Account_journalDTO.java
浏览文件 @ 9f40f2c6
...@@ -88,14 +88,6 @@ public class Account_journalDTO extends DTOBase implements Serializable { ...@@ -88,14 +88,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
@JsonProperty("show_on_dashboard") @JsonProperty("show_on_dashboard")
private Boolean showOnDashboard; private Boolean showOnDashboard;
/**
* 属性 [JOURNAL_USER]
*
*/
@JSONField(name = "journal_user")
@JsonProperty("journal_user")
private Boolean journalUser;
/** /**
* 属性 [ID] * 属性 [ID]
* *
...@@ -122,14 +114,6 @@ public class Account_journalDTO extends DTOBase implements Serializable { ...@@ -122,14 +114,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
@JsonProperty("at_least_one_inbound") @JsonProperty("at_least_one_inbound")
private Boolean atLeastOneInbound; private Boolean atLeastOneInbound;
/**
* 属性 [POST_AT_BANK_REC]
*
*/
@JSONField(name = "post_at_bank_rec")
@JsonProperty("post_at_bank_rec")
private Boolean postAtBankRec;
/** /**
* 属性 [NAME] * 属性 [NAME]
* *
...@@ -202,14 +186,6 @@ public class Account_journalDTO extends DTOBase implements Serializable { ...@@ -202,14 +186,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
@JsonProperty("__last_update") @JsonProperty("__last_update")
private Timestamp LastUpdate; private Timestamp LastUpdate;
/**
* 属性 [GROUP_INVOICE_LINES]
*
*/
@JSONField(name = "group_invoice_lines")
@JsonProperty("group_invoice_lines")
private Boolean groupInvoiceLines;
/** /**
* 属性 [REFUND_SEQUENCE_ID] * 属性 [REFUND_SEQUENCE_ID]
* *
...@@ -236,14 +212,6 @@ public class Account_journalDTO extends DTOBase implements Serializable { ...@@ -236,14 +212,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]") @Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String accountControlIds; private String accountControlIds;
/**
* 属性 [UPDATE_POSTED]
*
*/
@JSONField(name = "update_posted")
@JsonProperty("update_posted")
private Boolean updatePosted;
/** /**
* 属性 [KANBAN_DASHBOARD_GRAPH] * 属性 [KANBAN_DASHBOARD_GRAPH]
* *
...@@ -537,14 +505,6 @@ public class Account_journalDTO extends DTOBase implements Serializable { ...@@ -537,14 +505,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
this.modify("show_on_dashboard",showOnDashboard); this.modify("show_on_dashboard",showOnDashboard);
} }
/**
* 设置 [JOURNAL_USER]
*/
public void setJournalUser(Boolean journalUser){
this.journalUser = journalUser ;
this.modify("journal_user",journalUser);
}
/** /**
* 设置 [BANK_STATEMENTS_SOURCE] * 设置 [BANK_STATEMENTS_SOURCE]
*/ */
...@@ -561,14 +521,6 @@ public class Account_journalDTO extends DTOBase implements Serializable { ...@@ -561,14 +521,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
this.modify("at_least_one_inbound",atLeastOneInbound); this.modify("at_least_one_inbound",atLeastOneInbound);
} }
/**
* 设置 [POST_AT_BANK_REC]
*/
public void setPostAtBankRec(Boolean postAtBankRec){
this.postAtBankRec = postAtBankRec ;
this.modify("post_at_bank_rec",postAtBankRec);
}
/** /**
* 设置 [NAME] * 设置 [NAME]
*/ */
...@@ -585,14 +537,6 @@ public class Account_journalDTO extends DTOBase implements Serializable { ...@@ -585,14 +537,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
this.modify("code",code); this.modify("code",code);
} }
/**
* 设置 [GROUP_INVOICE_LINES]
*/
public void setGroupInvoiceLines(Boolean groupInvoiceLines){
this.groupInvoiceLines = groupInvoiceLines ;
this.modify("group_invoice_lines",groupInvoiceLines);
}
/** /**
* 设置 [REFUND_SEQUENCE_ID] * 设置 [REFUND_SEQUENCE_ID]
*/ */
...@@ -601,14 +545,6 @@ public class Account_journalDTO extends DTOBase implements Serializable { ...@@ -601,14 +545,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
this.modify("refund_sequence_id",refundSequenceId); this.modify("refund_sequence_id",refundSequenceId);
} }
/**
* 设置 [UPDATE_POSTED]
*/
public void setUpdatePosted(Boolean updatePosted){
this.updatePosted = updatePosted ;
this.modify("update_posted",updatePosted);
}
/** /**
* 设置 [TYPE] * 设置 [TYPE]
*/ */
......
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Hr_employeeDTO.java
浏览文件 @ 9f40f2c6
...@@ -1045,6 +1045,15 @@ public class Hr_employeeDTO extends DTOBase implements Serializable { ...@@ -1045,6 +1045,15 @@ public class Hr_employeeDTO extends DTOBase implements Serializable {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long resourceCalendarId; private Long resourceCalendarId;
/**
* 属性 [LEAVE_MANAGER_ID]
*
*/
@JSONField(name = "leave_manager_id")
@JsonProperty("leave_manager_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long leaveManagerId;
/** /**
* 设置 [MOBILE_PHONE] * 设置 [MOBILE_PHONE]
...@@ -1430,6 +1439,14 @@ public class Hr_employeeDTO extends DTOBase implements Serializable { ...@@ -1430,6 +1439,14 @@ public class Hr_employeeDTO extends DTOBase implements Serializable {
this.modify("resource_calendar_id",resourceCalendarId); this.modify("resource_calendar_id",resourceCalendarId);
} }
/**
* 设置 [LEAVE_MANAGER_ID]
*/
public void setLeaveManagerId(Long leaveManagerId){
this.leaveManagerId = leaveManagerId ;
this.modify("leave_manager_id",leaveManagerId);
}
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或