Skip to content

Commit

Permalink
Merge PR #343 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Oct 7, 2024
2 parents c37c370 + 04551cb commit 5a520df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions printer_zpl2/views/printing_label_zpl2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
widget="ace"
options="{'mode': 'python'}"
nolabel="1"
colspan="2"
/>
</group>
<notebook colspan="4">
Expand Down Expand Up @@ -302,6 +303,7 @@
widget="ace"
options="{'mode': 'python'}"
attrs="{'invisible':[('test_print_mode', '=', False), ('test_labelary_mode', '=', False)]}"
colspan="2"
/>
</group>
</page>
Expand Down
2 changes: 1 addition & 1 deletion printer_zpl2/wizard/wizard_import_zpl2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</group>
</group>
<group string="ZPL2">
<field name="data" widget="ace" nolabel="1" />
<field name="data" widget="ace" nolabel="1" colspan="2" />
</group>
<footer>
<button string="Cancel" class="btn-default" special="cancel" />
Expand Down

0 comments on commit 5a520df

Please sign in to comment.