Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
93e0d8c050
BIN
config/label_designs/PROTOTIPI/ERRECINQUE_flag_qr_only.nlbl
Normal file
BIN
config/label_designs/PROTOTIPI/ERRECINQUE_flag_qr_only.nlbl
Normal file
Binary file not shown.
20
config/label_templates/ERRECINQUE_flag_qr_only.prn
Normal file
20
config/label_templates/ERRECINQUE_flag_qr_only.prn
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
CT~~CD,~CC^~CT~
|
||||
^XA~TA000~JSN^LT0^MNW^MTT^PON^PMN^LH0,0^JMA^PR2,2~SD25^JUS^LRN^CI0^XZ
|
||||
^XA
|
||||
^MMT
|
||||
^PW320
|
||||
^LL1039
|
||||
^LS0
|
||||
^FO64,96^GFA,03840,03840,00024,:Z64:
|
||||
eJztVjuS2zAMJZeFSk0ql+q32SPwCmlS5xgpqaNsvZewjpAjqE7lIp5RIYuRxQ8eCGEnbWaCwmM/PxHvgQApY/5HihBL/GR4heOMcEf4irgjfFP4cQK8B3xW8JuCL2z9+7ccMTK8ZvNxPMUHFORIRY8JbHzQow/CDdhkjgOtGjCBpwRv6Hggm5f4GwUt9BVKbcmmZY7BJnM80MYOWNKeVDh03FE2y/YYHWMC5hiaqMeSzoR3pKLDBMwxlBQdNyUd6SskGHCPmeP6Q3eMJQUVV8Uxa6I3pYku6Bia6AVIimPeREFxHLCJwHHEklKuLqJjSuwj+1EpAYeXHL+w4XUVf878/SslKPg+w++kzdRHAxssE4oB1mW7oKUsiHu0C1qLgIXh/VIE3xjerUUOW964rcgxnL/x/A3fNsvvQJY/c9wU/nTKd42cfYGUvpFT+P3W4Jk/rAq+CPxI6G8CPz79fI4HBVf4NkwNnPULu6k+VuCF39LdBv8invKK8iS+E3jqB4mn/ukeLZ4K7ESZU4E7gad+drL88yk/91PX8vN8CX6eR8G/5vY5cPujRMjTk6dDXKuJj9f2CnzE58S/tfgN+PLa/nx9eI2ITD/iE+g3Y4mrUp+LUk+TcVH/oPC9sr9aP6QBlfw00LLftP60Cj/Pl+j/PEEn/PGUb9KEynkMiT/9Ld+P9K/ky/PBH3gQ58/n/EHh93LDDj3yPMx8UaDDrzxvM//kfD6Ak/M8EUXhCl+5L0J7vxS8MVAE+sZA6ZChvb/qfffO8H4t63FBfi26uCDl/iU/niWgN2ofH19sje/4PvDrowbd9ng41HPgGRwm+4HhVK6e4XPFeYKp4vuZebb88wyhuKP5V9I/mn8o/gBhS7Qa:78C0
|
||||
^FT293,614^A0I,25,21^FH\^FD{DD}/{MO}/{YY}^FS
|
||||
^FT145,614^A0I,25,21^FH\^FD{HH}:{MI}:{SS}^FS
|
||||
^FT291,952^A0I,25,24^FH\^FDNumero Disegno^FS
|
||||
^FT293,645^A0I,25,24^FH\^FDData/Ora Prova^FS
|
||||
^FT293,691^A0I,25,24^FH\^FDN. Pezzo:^FS
|
||||
^FT185,690^A0I,25,24^FH\^FD{SN5}^FS
|
||||
^BY120,120^FT289,803^BXI,6,200,0,0,1,~
|
||||
^FH\^FD{PART}{MO}{YY}{SN5}^FS
|
||||
^FT291,752^A0I,25,24^FH\^FD{PART}{MO}{YY}{SN5}^FS
|
||||
^FT293,558^A0I,25,24^FH\^FDEsito : CONFORME^FS
|
||||
^PQ1,0,1,Y^XZ
|
||||
|
|
@ -143,8 +143,6 @@ class Recipe_Selection(Widget):
|
|||
self.archive_synch.machine_status = "logged-in"
|
||||
self.archive_synch.machine_id = self.archive_synch.config.machine_id
|
||||
self.archive_synch.update_machine_status()
|
||||
#self.archive_synch.remote_fetch( self.archive_synch.machine_id )
|
||||
print("trying to import")
|
||||
# TESTING
|
||||
if "--auto-select" in sys.argv:
|
||||
recipe = "R56738/1"
|
||||
|
|
|
|||
|
|
@ -173,7 +173,8 @@ class Recipe_Spec_And_Step_Editor(Editor):
|
|||
self.steps_map[step_name]["spec"]=step_dict
|
||||
else:
|
||||
self.steps_map[step_name]["spec"] = {}
|
||||
self.crud().set_modified()
|
||||
if self.crud is not None:
|
||||
self.crud.set_modified()
|
||||
parsed_value=self.parse()
|
||||
self.cell_widget().value = parsed_value
|
||||
self.reset_steps()
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user