Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
5c8749e4
Commit
5c8749e4
authored
Nov 15, 2019
by
lijingjing
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'refs/heads/feature/agent' into develop
parents
5d92a8c4
90f33c10
Pipeline
#2935
canceled with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
hls_bp_master_check_division.lwm
...B-INF/classes/hls/HLS213/hls_bp_master_check_division.lwm
+4
-0
check_con_record.lwm
...n/webapp/WEB-INF/classes/hls/HLS500N/check_con_record.lwm
+2
-1
hls_fin_calculator_update_n.lview
...app/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
+1
-1
No files found.
src/main/webapp/WEB-INF/classes/hls/HLS213/hls_bp_master_check_division.lwm
View file @
5c8749e4
...
...
@@ -10,6 +10,10 @@
<bm:operation
name=
"update"
>
<bm:update-sql>
<![CDATA[
begin
hls_bp_master_pkg.check_lease_item_count(
p_agent_division_id =>
${@agent_division_id},
p_user_id =>${/session/@user_id}
);
hls_bp_master_pkg.check_lease_item_agent(
p_bp_id =>${@bp_id},
p_division =>${@division},
...
...
src/main/webapp/WEB-INF/classes/hls/HLS500N/check_con_record.lwm
View file @
5c8749e4
...
...
@@ -12,7 +12,8 @@
begin
con_contract_workflow_pkg.check_con_record(
p_contract_id =>
${@contract_id},
p_contract_status =>${@contract_status}
p_contract_status =>${@contract_status},
p_sign_contract_status =>${@sign_contract_status}
);
end;
...
...
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @
5c8749e4
...
...
@@ -799,7 +799,7 @@
},
success: function(res) {
var contract_status = res.result.contract_status;
if(
contract_status=='SIG
N'){
if(
sign_contract_status=='SIGN'||sign_contract_status=='SIGNING'|| contract_status=='NEW' || contract_status=='INCEPT_RETUR
N'){
for (var i = 0;i
< headRecords.length
;i++)
{
var
column_name =
headRecords[i].get('column_name')
if(column_name
!="lease_start_date"&&column_name
!="contract_inception_date"){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment