Skip to content

erp5
erp5
Commit d1c94d6a authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Xiaowu Zhang
Browse files
Options

erp5_travel_expense: Harmonise front page list to display all documents necessary

parent 012c6828
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 45 deletions
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js
View file @ d1c94d6a
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
return getData(gadget) return getData(gadget)
.push(function (doc) { .push(function (doc) {
var key; var key;
if (doc.sync_flag === '1') { if (doc.sync_flag === '1' && doc.simulation_state === "draft") {
sync = 1; sync = 1;
} }
return gadget.put(gadget.options.jio_key, doc); return gadget.put(gadget.options.jio_key, doc);
...@@ -372,6 +372,9 @@ ...@@ -372,6 +372,9 @@
}) })
.push(function () { .push(function () {
return gadget.props.geoGadget.createGeoLocationRecord(); return gadget.props.geoGadget.createGeoLocationRecord();
})
.push(function () {
return gadget.redirect();
}); });
} }
}) })
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.xml
View file @ d1c94d6a
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>supercedriclen</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>956.57356.32253.30464</string> </value> <value> <string>956.57543.33928.60006</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1485341787.05</float> <float>1485352808.19</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.js
View file @ d1c94d6a
...@@ -268,6 +268,9 @@ ...@@ -268,6 +268,9 @@
}) })
.push(function () { .push(function () {
alertify.success("Saved"); alertify.success("Saved");
if (sync === 1) {
return gadget.redirect();
}
}); });
} }
) )
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.xml
View file @ d1c94d6a
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>supercedriclen</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>956.57480.16314.62344</string> </value> <value> <string>956.57517.36246.49305</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1485349157.61</float> <float>1485352429.99</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.js
View file @ d1c94d6a
...@@ -277,6 +277,9 @@ ...@@ -277,6 +277,9 @@
}) })
.push(function () { .push(function () {
alertify.success("Saved"); alertify.success("Saved");
if (sync) {
return gadget.redirect();
}
}); });
} }
) )
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.xml
View file @ d1c94d6a
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>supercedriclen</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>956.57361.9593.1092</string> </value> <value> <string>956.57502.32307.34304</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1485341897.03</float> <float>1485351571.43</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.html
View file @ d1c94d6a
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<section class=""> <section class="">
<h3 class="ui-body-c"> <h3 class="ui-body-c">
<span class="ui-icon ui-icon-custom ui-icon-exchange">&nbsp;</span> <span class="ui-icon ui-icon-custom ui-icon-exchange">&nbsp;</span>
Expenses to Answer Elements to Answer
</h3> </h3>
</section> </section>
<section class="ui-body-c ui-content-section"> <section class="ui-body-c ui-content-section">
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<section class=""> <section class="">
<h3 class="ui-body-c"> <h3 class="ui-body-c">
<span class="ui-icon ui-icon-custom ui-icon-exchange">&nbsp;</span> <span class="ui-icon ui-icon-custom ui-icon-exchange">&nbsp;</span>
Expenses to Post Elements to Post
</h3> </h3>
</section> </section>
<section class="ui-body-c ui-content-section"> <section class="ui-body-c ui-content-section">
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.xml
View file @ d1c94d6a
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>supercedriclen</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>956.54794.17747.54920</string> </value> <value> <string>956.57534.1636.37307</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1485342857.58</float> <float>1485352210.95</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.js
View file @ d1c94d6a
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
title: 'State' title: 'State'
}], }],
query: { query: {
query: 'portal_type:("' + gadget.props.portal_type + '") AND state:"Suspended"', query: 'portal_type:("% Record") AND state:"Suspended"',
select_list: ['doc_id', 'quantity', 'resource_title', select_list: ['doc_id', 'quantity', 'resource_title',
'comment', 'date', 'type_title', 'comment', 'date', 'type_title',
'state'], 'state'],
...@@ -109,29 +109,15 @@ ...@@ -109,29 +109,15 @@
select: 'comment', select: 'comment',
title: 'Description' title: 'Description'
}, { }, {
select: 'type_title', select: 'portal_type',
title: 'Type' title: 'Type'
}, {
select: 'quantity',
title: 'Total Price'
}, {
select: 'resource_title',
title: 'Currency'
}, {
select: 'date',
title: 'Input Date'
}, {
select: 'doc_id',
title: 'ID'
}, { }, {
select: 'state', select: 'state',
title: 'State' title: 'State'
}], }],
query: { query: {
query: 'portal_type:("' + gadget.props.portal_type + '" OR "Expense Record Temp") AND sync_flag:"0"', query: '(simulation_state:"draft" OR sync_flag:"0")',
select_list: ['doc_id', 'quantity', 'resource_title', select_list: ['comment', 'portal_type', 'state'],
'comment', 'date', 'type_title',
'state'],
sort_on: [["modification_date", "descending"]] sort_on: [["modification_date", "descending"]]
} }
}) })
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.xml
View file @ d1c94d6a
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>supercedriclen</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>956.57372.34651.59340</string> </value> <value> <string>956.57556.539.5205</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1485342563.92</float> <float>1485353656.91</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio.xml
View file @ d1c94d6a
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<string>my_quantity</string> <string>my_quantity</string>
<string>my_date</string> <string>my_date</string>
<string>my_comment</string> <string>my_comment</string>
<string>my_sync_flag</string> <string>your_sync_flag</string>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>my_copy_of</string> <string>my_copy_of</string>
<string>my_record_revision</string> <string>my_record_revision</string>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio/my_sync_flag.xml → bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio/your_sync_flag.xml
View file @ d1c94d6a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_sync_flag</string> </value> <value> <string>your_sync_flag</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value> <string>-1</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio.xml
View file @ d1c94d6a
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<string>your_simulation_state</string> <string>your_simulation_state</string>
<string>my_title</string> <string>my_title</string>
<string>your_state</string> <string>your_state</string>
<string>my_sync_flag</string> <string>your_sync_flag</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio/my_sync_flag.xml → bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio/your_sync_flag.xml
View file @ d1c94d6a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_sync_flag</string> </value> <value> <string>your_sync_flag</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -152,6 +152,10 @@ ...@@ -152,6 +152,10 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>input_type</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>max_length</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -193,7 +197,7 @@ ...@@ -193,7 +197,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value> <string>-1</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/TravelRequestRecord_viewAsJio.xml
View file @ d1c94d6a
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<string>my_quantity</string> <string>my_quantity</string>
<string>my_stop_date</string> <string>my_stop_date</string>
<string>my_comment</string> <string>my_comment</string>
<string>my_sync_flag</string> <string>your_sync_flag</string>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>my_copy_of</string> <string>my_copy_of</string>
<string>my_record_revision</string> <string>my_record_revision</string>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/TravelRequestRecord_viewAsJio/my_sync_flag.xml → bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/TravelRequestRecord_viewAsJio/your_sync_flag.xml
View file @ d1c94d6a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_sync_flag</string> </value> <value> <string>your_sync_flag</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -152,6 +152,10 @@ ...@@ -152,6 +152,10 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>input_type</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>max_length</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -193,7 +197,7 @@ ...@@ -193,7 +197,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value> <string>-1</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
......
Markdown is supported
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7