MetletToledoScale

Merge lp:~cavinc20/metlettoledoscale/dev into lp:metlettoledoscale/1.0

  1. dev
  2. Merge into trunk
Proposed by cav
Status: Merged
Merged at revision: 33
Proposed branch: lp:~cavinc20/metlettoledoscale/dev
Merge into: lp:metlettoledoscale/1.0
Diff against target: 11 lines (+1/-1)
1 file modified
tiger.py (+1/-1)
To merge this branch: bzr merge lp:~cavinc20/metlettoledoscale/dev
Reviewer Review Type Date Requested Status
cav Pending
Review via email: mp+260539@code.launchpad.net

This proposal supersedes a proposal from 2015-05-28.

To post a comment you must log in.
Revision history for this message
cav (cavinc20) wrote : Posted in a previous version of this proposal

Исправления в интерфейсе

Revision history for this message
cav (cavinc20) : Posted in a previous version of this proposal
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tiger.py'
2--- tiger.py 2013-03-21 16:26:35 +0000
3+++ tiger.py 2015-05-29 03:39:46 +0000
4@@ -159,7 +159,7 @@
5 mb.add(self.__set_menu_main('Весы',[[u'Настрока подключения','setlink'],[u'Выход','quit']]))
6 mb.add(self.__set_menu_main('Данные',[['Товары','plu'],'-',[u'Группы товаров','grouptovar'],[u'Продавцы','selers'],[u'Тара','tare'],'-',[u'Маска штрихкода','barcodemask'],'-',[u'Бегущая строка','scrollstr'],[u'Верхний и нижний текст чека','colontituls'],[u'Название магазина','shopname'],[u'Рекламный текст','misktext'],[u'Дополнительные тексты(ингридиенты)','doptext']]))
7 mb.add(self.__set_menu_main('Конфигурация',[['Конфигурация обслуживания','configsale']]))
8- mb.add(self.__set_menu_main('Редактор этикеток',[[u'Редактор этикеток','labeldesign'],[u'Редактро клавиатуры PLU','setkeyplu']]))
9+ mb.add(self.__set_menu_main('Редактор этикеток',[[u'Редактор этикеток','labeldesign'],[u'Редактор клавиатуры PLU','setkeyplu']]))
10 mb.add(self.__set_menu_main('Помощь',[[u'О программе','about']]))
11 return mb
12

Subscribers

People subscribed via source and target branches

to all changes: