diff --git a/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_html.html b/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_html.html index f1fc1d6f43b9b80259ca34a514b1f251748f3927..d5c0430bf75439bedd3e1645d012536c50e2aa3e 100644 --- a/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_html.html +++ b/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_html.html @@ -73,7 +73,7 @@ <div class="ui-field-contain"> <label data-i18n="Photo">Photo</label> - <input name="photo" type="file" accept="image/*" capture="camera"> + <input name="photo" type="file"><!--accept="image/*" capture="camera"--> </div> <div class="ui-field-contain"> diff --git a/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_html.xml b/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_html.xml index 03ea3e5256820522e00440b3e3f86bd0ca49fbfd..4856a281545b875592dc789badb7cdfed9767a06 100644 --- a/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_html.xml +++ b/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_html.xml @@ -68,6 +68,7 @@ <value> <tuple> <string>contributor/person_module/2</string> + <string>contributor/person_module/5</string> </tuple> </value> </item> @@ -232,7 +233,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>zope</string> </value> + <value> <string>P4</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -246,7 +247,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>956.44329.14852.21316</string> </value> + <value> <string>960.56103.37527.44765</string> </value> </item> <item> <key> <string>state</string> </key> @@ -264,7 +265,7 @@ </tuple> <state> <tuple> - <float>1484576962.29</float> + <float>1502900981.42</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js b/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js index 5120969bd8c7b6f29ff05dc617ec0a5e23fc2a36..b942e71561db6da8d1b23ef7cdfd3f0a1a86c46a 100644 --- a/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js +++ b/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js @@ -410,6 +410,7 @@ .push(function (result) { img = new Image(); img.src = result.target.result; + gadget.options.doc.photo_data = img.src; return RSVP.all([ gadget.props.deferred1.promise, @@ -426,7 +427,6 @@ ctx.fillText('Longitude: ' + gadget.props.geoLocation.coords.longitude +" Latitude: " + gadget.props.geoLocation.coords.latitude, 0, canvas.height - 20); gadget.options.doc.photo_data = canvas.toDataURL(); */ - gadget.options.doc.photo_data = img.src; preview.src = gadget.options.doc.photo_data; }); } diff --git a/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.xml b/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.xml index e3e287bfcc06da5a2bb5cf7a52a7793dc9bf9ab8..8adc8350af9d4204700032009b16b20d5655e93c 100644 --- a/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.xml +++ b/bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.xml @@ -68,6 +68,7 @@ <value> <tuple> <string>contributor/person_module/2</string> + <string>contributor/person_module/5</string> </tuple> </value> </item> @@ -228,7 +229,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>zope</string> </value> + <value> <string>cedric.le.ninivin</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -242,7 +243,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>956.58658.21925.32853</string> </value> + <value> <string>961.29556.33516.42052</string> </value> </item> <item> <key> <string>state</string> </key> @@ -260,7 +261,7 @@ </tuple> <state> <tuple> - <float>1486473658.84</float> + <float>1502904411.77</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_updateRelatedTicket.py b/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_updateRelatedTicket.py index 5ea5794f82a9d5d8d6c93d366bcf38402b67f6ac..c915034b0f471ac5654585fecc0c0d97a689a8b9 100644 --- a/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_updateRelatedTicket.py +++ b/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_updateRelatedTicket.py @@ -74,13 +74,17 @@ publication_section = portal.ERP5Site_getPreferredExpenseDocumentPublicationSect photo_data = record.getPhotoData() if photo_data: if "," in photo_data and ticket: - photo_data = photo_data.split(",")[1] + photo_type, photo_data = photo_data.split(",") + filename="tmp.png" + # XXX This is getting more hackish + if "application/pdf" in photo_type: + filename="tmp.pdf" image = portal.portal_contributions.newContent( data = photo_data.decode('base64'), reference=ticket.getReference()+ "-justificatif", title = ticket.getReference() + " Justificatif", description = ticket.getDescription(), - filename="tmp.png", + filename=filename, follow_up=ticket.getRelativeUrl(), publication_section=publication_section.getRelativeUrl(), group=ticket.getDestinationDecisionValue().getGroup() diff --git a/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/ExpenseValidationRequest_view/your_image.xml b/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/ExpenseValidationRequest_view/your_image.xml index 32451f286267dfa6214f44bc1a91de1290ebcb13..5ee81217aa79e3f372b3c9f34d42a78c66350357 100644 --- a/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/ExpenseValidationRequest_view/your_image.xml +++ b/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/ExpenseValidationRequest_view/your_image.xml @@ -301,7 +301,7 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -python:\'<a href="%(image_url)s"><img src="%(image_url)s?display=large"></a>\' % {\'image_url\': here.ExpenseValidationRequest_getRelatedExpenseProofUrl()} +python:\'<a href="%(image_url)s"><img src="%(image_url)s?format=png&display=large"></a>\' % {\'image_url\': here.ExpenseValidationRequest_getRelatedExpenseProofUrl()} ]]></string> </value> </item>