Skip to content

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

erp5_travel_expense: Remove usage of title on Expense 

erp5_travel_expense: Also remove Title from expense view in app

erp5_travel_expense: Remove all form of titles
parent 5fdcc441
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 618 additions and 310 deletions
bt5/erp5_travel_expense/ActionTemplateItem/portal_types/Expense%20Validation%20Request%20Module/view.xml
View file @ 3c1184de
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/TravelRequestModule_view</string> </value> <value> <string>string:${object_url}/ExpenseValidationRequestModule_viewExpenseValidationRequestList</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_js.js
View file @ 3c1184de
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
search_page: 'document_list', search_page: 'document_list',
search: options.search, search: options.search,
column_list: [{ column_list: [{
select: 'title', select: 'comment',
title: 'Title' title: 'Description'
}, { }, {
select: 'quantity', select: 'quantity',
title: 'Total Price' title: 'Total Price'
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
}], }],
query: { query: {
query: 'portal_type:("Expense Record" OR "Expense Record Temp")', query: 'portal_type:("Expense Record" OR "Expense Record Temp")',
select_list: ['doc_id', 'quantity', 'resource_title', 'title', select_list: ['doc_id', 'quantity', 'resource_title',
'comment', 'date', 'portal_type', 'sync_flag', 'comment', 'date', 'portal_type', 'sync_flag',
'state'], 'state'],
sort_on: [["doc_id", "descending"]] sort_on: [["doc_id", "descending"]]
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_js.xml
View file @ 3c1184de
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>955.64153.34006.33723</string> </value> <value> <string>956.4266.40527.32802</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>1481817318.68</float> <float>1483626541.32</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_html.html
View file @ 3c1184de
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
</div> </div>
{{#if not_readonly}} {{#if not_readonly}}
<div class="ui-field-contain"> <div class="ui-field-contain">
<label data-i18n="Title">Title</label> <label data-i18n="Description">Description</label>
<input type="text" name="title" value="{{title}}" required> <textarea name="comment">{{comment}}</textarea>
</div> </div>
<div class="ui-field-contain"> <div class="ui-field-contain">
<label data-i18n="Total Price">Total Price</label> <label data-i18n="Total Price">Total Price</label>
...@@ -73,12 +73,12 @@ ...@@ -73,12 +73,12 @@
{{/if}} {{/if}}
</div> </div>
<div class="ui-field-contain"> <div class="ui-field-contain" style="display:none;">
<label data-i18n="Longitude">Longitude</label> <label data-i18n="Longitude">Longitude</label>
<input type="number" name="longitude" value="{{longitude}}" readonly class='ui-state-readonly' /> <input type="number" name="longitude" value="{{longitude}}" readonly class='ui-state-readonly' />
</div> </div>
<div class="ui-field-contain"> <div class="ui-field-contain" style="display:none;">
<label data-i18n="Latitude">Latitude</label> <label data-i18n="Latitude">Latitude</label>
<input type="number" name="latitude" value="{{latitude}}" readonly class='ui-state-readonly' /> <input type="number" name="latitude" value="{{latitude}}" readonly class='ui-state-readonly' />
</div> </div>
...@@ -89,11 +89,6 @@ ...@@ -89,11 +89,6 @@
<input type="date" name="date" value="{{date}}" required> <input type="date" name="date" value="{{date}}" required>
</div> </div>
<div class="ui-field-contain">
<label data-i18n="Comment">Comment</label>
<textarea name="comment">{{comment}}</textarea>
</div>
<div class="ui-field-contain"> <div class="ui-field-contain">
<label data-i18n="Related Mission">Related Mission</label> <label data-i18n="Related Mission">Related Mission</label>
<div class='ui-input-text ui-body-inherit ui-corner-all ui-shadow-inset ui-input-has-clear ui-input-has-icon'> <div class='ui-input-text ui-body-inherit ui-corner-all ui-shadow-inset ui-input-has-clear ui-input-has-icon'>
...@@ -118,8 +113,8 @@ ...@@ -118,8 +113,8 @@
{{else}} {{else}}
<div class="ui-field-contain"> <div class="ui-field-contain">
<label data-i18n="Title">Title</label> <label data-i18n="Description">Description</label>
<input type="text" name="title" value="{{title}}" readonly class='ui-state-readonly'> <textarea name="comment" readonly class='ui-state-readonly'>{{comment}}</textarea>
</div> </div>
<div class="ui-field-contain"> <div class="ui-field-contain">
...@@ -154,17 +149,6 @@ ...@@ -154,17 +149,6 @@
{{/if}} {{/if}}
</div> </div>
<div class="ui-field-contain">
<label data-i18n="Longitude">Longitude</label>
<input type="number" name="longitude" value="{{longitude}}" readonly class='ui-state-readonly' />
</div>
<div class="ui-field-contain">
<label data-i18n="Latitude">Latitude</label>
<input type="number" name="latitude" value="{{latitude}}" readonly class='ui-state-readonly' />
</div>
<div class="ui-field-contain"> <div class="ui-field-contain">
<label data-i18n="Input Date">Input Date</label> <label data-i18n="Input Date">Input Date</label>
<input type="date" name="date" value="{{date}}" readonly class='ui-state-readonly'> <input type="date" name="date" value="{{date}}" readonly class='ui-state-readonly'>
...@@ -182,10 +166,6 @@ ...@@ -182,10 +166,6 @@
</div> </div>
</div> </div>
<div class="ui-field-contain">
<label data-i18n="Comment">Comment</label>
<textarea name="comment" readonly class='ui-state-readonly'>{{comment}}</textarea>
</div>
{{/if}} {{/if}}
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js
View file @ 3c1184de
...@@ -265,7 +265,6 @@ ...@@ -265,7 +265,6 @@
preview: options.doc.photo_data, preview: options.doc.photo_data,
quantity: options.doc.quantity, quantity: options.doc.quantity,
date: options.doc.date || new Date().toISOString().slice(0,10), date: options.doc.date || new Date().toISOString().slice(0,10),
title: options.doc.title,
comment: options.doc.comment, comment: options.doc.comment,
sync_checked: sync_checked, sync_checked: sync_checked,
not_sync_checked: not_sync_checked, not_sync_checked: not_sync_checked,
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_updateRelatedTicket.py
View file @ 3c1184de
...@@ -12,7 +12,7 @@ if record.getDestinationReference() is not None: ...@@ -12,7 +12,7 @@ if record.getDestinationReference() is not None:
else: else:
# No destination reference means no ticket to track it server side: Create a new one # No destination reference means no ticket to track it server side: Create a new one
record.Event_createFollowUpTicket( record.Event_createFollowUpTicket(
follow_up_ticket_title=record.getTitle(), follow_up_ticket_title=record.getComment(),
follow_up_ticket_type="Expense Validation Request", follow_up_ticket_type="Expense Validation Request",
) )
ticket = record.getFollowUpValue() ticket = record.getFollowUpValue()
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_view.xml
View file @ 3c1184de
...@@ -80,7 +80,6 @@ ...@@ -80,7 +80,6 @@
<list> <list>
<string>my_reference</string> <string>my_reference</string>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>my_title</string>
<string>my_date</string> <string>my_date</string>
<string>my_quantity</string> <string>my_quantity</string>
<string>my_resource_title</string> <string>my_resource_title</string>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio.xml
View file @ 3c1184de
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<string>my_resource_title</string> <string>my_resource_title</string>
<string>your_simulation_state</string> <string>your_simulation_state</string>
<string>your_state</string> <string>your_state</string>
<string>my_title</string> <string>your_title</string>
<string>my_related_mission_url</string> <string>my_related_mission_url</string>
<string>my_related_mission</string> <string>my_related_mission</string>
</list> </list>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_view/my_title.xml → bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio/your_title.xml
View file @ 3c1184de
...@@ -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_title</string> </value> <value> <string>your_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/ExpenseValidationRequestModule_viewExpenseValidationRequestList.xml
View file @ 3c1184de
...@@ -67,7 +67,10 @@ ...@@ -67,7 +67,10 @@
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list/> <list>
<string>listbox_delivery_start_date</string>
<string>listbox_delivery_stop_date</string>
</list>
</value> </value>
</item> </item>
<item> <item>
......
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/ExpenseValidationRequestModule_viewExpenseValidationRequestList/listbox_delivery_start_date.xml 0 → 100644
View file @ 3c1184de
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_delivery_start_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_ticket_start_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewCRMFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/ExpenseValidationRequestModule_viewExpenseValidationRequestList/listbox_delivery_stop_date.xml 0 → 100644
View file @ 3c1184de
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_delivery_stop_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_stop_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewCRMFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/ExpenseValidationRequest_view.xml
View file @ 3c1184de
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
<string>listbox_delivery_start_date</string> <string>listbox_delivery_start_date</string>
<string>listbox_destination_title</string> <string>listbox_destination_title</string>
<string>listbox_content</string> <string>listbox_content</string>
<string>my_title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -102,7 +103,6 @@ ...@@ -102,7 +103,6 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_title</string>
<string>my_reference</string> <string>my_reference</string>
<string>my_resource</string> <string>my_resource</string>
<string>my_destination_section_title</string> <string>my_destination_section_title</string>
......
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