Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
erp5
Commits
defe69a2
Commit
defe69a2
authored
Jun 29, 2020
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_printer: only show print button when in normal view
not from fast input
parent
d31d03d8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
12 deletions
+14
-12
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_html.html
...mplateItem/web_page_module/gadget_epson_printer_html.html
+8
-7
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_html.xml
...emplateItem/web_page_module/gadget_epson_printer_html.xml
+2
-2
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_js.js
...thTemplateItem/web_page_module/gadget_epson_printer_js.js
+1
-0
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_js.xml
...hTemplateItem/web_page_module/gadget_epson_printer_js.xml
+2
-2
bt5/erp5_printer/SkinTemplateItem/portal_skins/erp5_printer/SaleOrder_viewPrintByEpsonDialog/preview.xml
...erp5_printer/SaleOrder_viewPrintByEpsonDialog/preview.xml
+1
-1
No files found.
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_html.html
View file @
defe69a2
...
...
@@ -168,7 +168,7 @@
<
div
class
=
"
footer_button
"
>
<
button
id
=
"
print_button
"
><
span
>
{{
Print_by_Epson
}}
<
/span></
button
>
{{
#
if
auto_print
}}
<
button
class
=
"
confirm_return
"
type
=
"
submit
"
value
=
"
SaleOrder_confirmAndReturn
"
>
<
span
>
{{
Confirm_Order_and_Return
}}
<
/span
>
<
/button
>
...
...
@@ -176,6 +176,7 @@
<
button
class
=
"
cancel_return
"
type
=
"
submit
"
value
=
"
SaleOrder_cancelAndReturn
"
>
<
span
>
{{
Cancel_Order_and_Return
}}
<
/span
>
<
/button
>
{{
/
if
}}
<
/div
>
<
hr
>
<
div
id
=
"
js_error_log
"
>
<
/div
>
...
...
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_html.xml
View file @
defe69a2
...
...
@@ -250,7 +250,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
984.
42457.24733.27289
</string>
</value>
<value>
<string>
984.
58233.19545.12100
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -268,7 +268,7 @@
</tuple>
<state>
<tuple>
<float>
159
2474753.59
</float>
<float>
159
3421374.82
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_js.js
View file @
defe69a2
...
...
@@ -58,6 +58,7 @@
//example: sale_order_module/356, total price is 30464.8, but return 30464.79999999999
data_dict
.
total_price_with_discount
=
Math
.
round
(
data_dict
.
total_price_with_discount
*
100
)
/
100
;
data_dict
.
total_price
=
Math
.
round
(
data_dict
.
total_price
*
100
)
/
100
;
data_dict
.
auto_print
=
options
.
auto_print
;
gadget
.
element
.
querySelector
(
'
.container
'
).
innerHTML
=
epson_print_template
(
data_dict
);
...
...
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_js.xml
View file @
defe69a2
...
...
@@ -252,7 +252,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
984.4407
1.55409.13482
</string>
</value>
<value>
<string>
984.4407
5.1419.10496
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -270,7 +270,7 @@
</tuple>
<state>
<tuple>
<float>
159
2571541.29
</float>
<float>
159
3420843.63
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_printer/SkinTemplateItem/portal_skins/erp5_printer/SaleOrder_viewPrintByEpsonDialog/preview.xml
View file @
defe69a2
...
...
@@ -253,7 +253,7 @@
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python:{"jio_key": context.getRelativeUrl(), "data_dict": context.Order_getODTDataDict(), "printer_url": context.SaleOrder_getPrinterUrl()}
</string>
</value>
<value>
<string>
python:{"jio_key": context.getRelativeUrl(), "data_dict": context.Order_getODTDataDict(), "printer_url": context.SaleOrder_getPrinterUrl()
, "auto_print": context.REQUEST.get("auto_print", 0)
}
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
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