[POS-commit] r5386 - in stoq/trunk: data/glade stoq/gui/till
Johan Dahlin
jdahlin at async.com.br
Tue Nov 28 11:04:09 BRST 2006
Author: jdahlin
Date: Tue Nov 28 11:04:08 2006
New Revision: 5386
Modified:
stoq/trunk/data/glade/till.glade
stoq/trunk/po/pt_BR.po
stoq/trunk/po/stoq.pot
stoq/trunk/po/sv.po
stoq/trunk/stoq/gui/till/till.py
Log:
#2945: Implementação das funções de Encaixes e Sangrias parciais.
Modified: stoq/trunk/data/glade/till.glade
==============================================================================
--- stoq/trunk/data/glade/till.glade (original)
+++ stoq/trunk/data/glade/till.glade Tue Nov 28 11:04:08 2006
@@ -11,6 +11,12 @@
</widget>
</child>
<child>
+ <widget class="GtkAction" id="AddCash">
+ <property name="name">AddCash</property>
+ <property name="label" translatable="yes">Add cash...</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkAction" id="ChangeUser">
<property name="name">ChangeUser</property>
<property name="label" translatable="yes">Change User</property>
@@ -107,6 +113,12 @@
</widget>
</child>
<child>
+ <widget class="GtkAction" id="RemoveCash">
+ <property name="name">RemoveCash</property>
+ <property name="label" translatable="yes">Remove cash...</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkAction" id="SaleSearch">
<property name="name">SaleSearch</property>
<property name="label" translatable="yes">Sales...</property>
@@ -201,7 +213,7 @@
</child>
<ui id="initial-state"><![CDATA[<ui>
<menubar action="menubar" name="menubar">
-<menu action="TillMenu" name="TillMenu"><menuitem action="TillOpen" name="TillOpen"/><menuitem action="TillClose" name="TillClose"/><separator/><menuitem action="quit_action" name="quit_action"/></menu><menu action="Actions" name="Actions"><menuitem action="ClientSearch" name="ClientSearch"/><menuitem action="SaleSearch" name="SaleSearch"/><separator/><menuitem action="Treasury" name="Treasury"/><menuitem action="FiscalTillOperations" name="FiscalTillOperations"/></menu><menu action="help_menu" name="help_menu"><menuitem action="about_menu" name="about_menu"/></menu></menubar>
+<menu action="TillMenu" name="TillMenu"><menuitem action="TillOpen" name="TillOpen"/><menuitem action="TillClose" name="TillClose"/><separator/><menuitem action="AddCash" name="AddCash"/><menuitem action="RemoveCash" name="RemoveCash"/><separator name="sep"/><menuitem action="quit_action" name="quit_action"/></menu><menu action="Actions" name="Actions"><menuitem action="ClientSearch" name="ClientSearch"/><menuitem action="SaleSearch" name="SaleSearch"/><separator name="sep2"/><menuitem action="Treasury" name="Treasury"/><menuitem action="FiscalTillOperations" name="FiscalTillOperations"/></menu><menu action="help_menu" name="help_menu"><menuitem action="about_menu" name="about_menu"/></menu></menubar>
</ui>]]></ui>
</widget>
<widget class="GtkWindow" id="till">
Modified: stoq/trunk/po/pt_BR.po
==============================================================================
--- stoq/trunk/po/pt_BR.po (original)
+++ stoq/trunk/po/pt_BR.po Tue Nov 28 11:04:08 2006
@@ -23,8 +23,8 @@
msgstr ""
"Project-Id-Version: stoq 0.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-28 10:47-0200\n"
-"PO-Revision-Date: 2006-10-11 15:24-0300\n"
+"POT-Creation-Date: 2006-11-28 10:48-0200\n"
+"PO-Revision-Date: 2006-11-28 10:49-0200\n"
"Last-Translator: Bruno Rafael Garcia <brg at async.com.br>\n"
"Language-Team: Brazilian portuguese <pt_BR at li.org>\n"
"MIME-Version: 1.0\n"
@@ -119,11 +119,11 @@
#: ../stoq/gui/application.py:202
msgid "Debug"
-msgstr ""
+msgstr "Debug"
#: ../stoq/gui/application.py:203
msgid "Introspect slaves"
-msgstr ""
+msgstr "Introspectar slave"
#. This method must be redefined in child when it's needed
#: ../stoq/gui/application.py:228
@@ -239,21 +239,21 @@
msgid "Purchase"
msgstr "Compras"
-#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:65
+#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:66
msgid "order"
msgstr "pedido"
-#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:65
+#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:66
msgid "orders"
msgstr "pedidos"
#: ../stoq/gui/purchase/purchase.py:62 ../stoq/gui/admin/admin.py:61
-#: ../stoq/gui/sales/sales.py:60 ../stoq/gui/till/till.py:66
+#: ../stoq/gui/sales/sales.py:60 ../stoq/gui/till/till.py:67
#: ../stoq/gui/receivable/receivable.py:51
msgid "matching:"
msgstr "contendo:"
-#: ../stoq/gui/purchase/purchase.py:63 ../stoq/gui/till/till.py:67
+#: ../stoq/gui/purchase/purchase.py:63 ../stoq/gui/till/till.py:68
msgid "Show orders with status"
msgstr "Exibir pedidos com situação"
@@ -297,12 +297,12 @@
msgstr "Qualquer"
#: ../stoq/gui/purchase/purchase.py:213 ../stoq/gui/sales/sales.py:164
-#: ../stoq/gui/till/till.py:198 ../stoq/gui/receivable/receivable.py:95
+#: ../stoq/gui/till/till.py:201 ../stoq/gui/receivable/receivable.py:95
msgid "Number"
msgstr "Número"
#: ../stoq/gui/purchase/purchase.py:215 ../stoq/gui/sales/sales.py:64
-#: ../stoq/gui/till/till.py:200
+#: ../stoq/gui/till/till.py:203
msgid "Date Started"
msgstr "Data de Abertura"
@@ -390,48 +390,48 @@
msgid "Preview Model"
msgstr "Exibir Modelo"
-#: ../stoq/gui/sales/sales.py:166 ../stoq/gui/till/till.py:202
+#: ../stoq/gui/sales/sales.py:166 ../stoq/gui/till/till.py:205
msgid "Client"
msgstr "Cliente"
-#: ../stoq/gui/sales/sales.py:168 ../stoq/gui/till/till.py:204
+#: ../stoq/gui/sales/sales.py:168 ../stoq/gui/till/till.py:207
msgid "Salesperson"
msgstr "Vendedor"
-#: ../stoq/gui/sales/sales.py:170 ../stoq/gui/till/till.py:206
+#: ../stoq/gui/sales/sales.py:170 ../stoq/gui/till/till.py:209
msgid "Items Quantity"
msgstr "Quantidade de Itens"
-#: ../stoq/gui/sales/sales.py:173 ../stoq/gui/till/till.py:209
+#: ../stoq/gui/sales/sales.py:173 ../stoq/gui/till/till.py:212
#: ../stoq/gui/pos/pos.py:522
msgid "Total"
msgstr "Total"
-#: ../stoq/gui/till/till.py:60 ../data/glade/pos.glade.h:49
+#: ../stoq/gui/till/till.py:61 ../data/glade/pos.glade.h:49
msgid "Till"
msgstr "Caixa"
-#: ../stoq/gui/till/till.py:82 ../stoq/gui/pos/pos.py:128
+#: ../stoq/gui/till/till.py:83 ../stoq/gui/pos/pos.py:128
#, python-format
msgid "Total: %s"
msgstr "Total: %s"
-#: ../stoq/gui/till/till.py:111
+#: ../stoq/gui/till/till.py:114
msgid "Till Closed"
msgstr "Caixa Fechado"
-#: ../stoq/gui/till/till.py:117
+#: ../stoq/gui/till/till.py:120
#, python-format
msgid "Till Opened on %s"
msgstr "Caixa Aberto em %s"
-#: ../stoq/gui/till/till.py:159
+#: ../stoq/gui/till/till.py:162
msgid "Confirm Sale"
msgstr "Confirmar a Venda"
#. XXX The current approch to get the current branch is going to
#. be improved after bug 2621
-#: ../stoq/gui/till/till.py:195
+#: ../stoq/gui/till/till.py:198
#, python-format
msgid "Stoq - Till for Branch %03d"
msgstr "Stoq - Caixa para Unidade %03d"
@@ -596,7 +596,7 @@
msgid "Company"
msgstr "Pessoa Jurídica"
-#: ../data/glade/NewOrderEditor.glade.h:5 ../data/glade/till.glade.h:11
+#: ../data/glade/NewOrderEditor.glade.h:5 ../data/glade/till.glade.h:12
#: ../data/glade/purchase.glade.h:12 ../data/glade/receivable.glade.h:8
msgid "Details"
msgstr "Detalhes"
@@ -632,12 +632,12 @@
msgid "About"
msgstr "Sobre"
-#: ../data/glade/sales_app.glade.h:2 ../data/glade/till.glade.h:2
+#: ../data/glade/sales_app.glade.h:2 ../data/glade/till.glade.h:3
#: ../data/glade/receivable.glade.h:3
msgid "Change User"
msgstr "Trocar de Usuário"
-#: ../data/glade/sales_app.glade.h:3 ../data/glade/till.glade.h:3
+#: ../data/glade/sales_app.glade.h:3 ../data/glade/till.glade.h:4
#: ../data/glade/purchase.glade.h:8 ../data/glade/admin.glade.h:7
#: ../data/glade/receivable.glade.h:4 ../data/glade/warehouse.glade.h:4
msgid "Clear Cookie"
@@ -647,26 +647,26 @@
msgid "Clients"
msgstr "Clientes"
-#: ../data/glade/sales_app.glade.h:5 ../data/glade/till.glade.h:4
+#: ../data/glade/sales_app.glade.h:5 ../data/glade/till.glade.h:5
#: ../data/glade/pos.glade.h:12
msgid "Clients..."
msgstr "Clientes..."
-#: ../data/glade/sales_app.glade.h:6 ../data/glade/till.glade.h:7
+#: ../data/glade/sales_app.glade.h:6 ../data/glade/till.glade.h:8
#: ../data/glade/purchase.glade.h:9 ../data/glade/admin.glade.h:8
#: ../data/glade/receivable.glade.h:5 ../data/glade/pos.glade.h:14
#: ../data/glade/warehouse.glade.h:5
msgid "Copy selected object into the clipboard"
msgstr "Copiar objeto selecionado para a memória"
-#: ../data/glade/sales_app.glade.h:7 ../data/glade/till.glade.h:8
+#: ../data/glade/sales_app.glade.h:7 ../data/glade/till.glade.h:9
#: ../data/glade/purchase.glade.h:10 ../data/glade/admin.glade.h:9
#: ../data/glade/receivable.glade.h:6 ../data/glade/pos.glade.h:15
#: ../data/glade/warehouse.glade.h:6
msgid "Create a new file"
msgstr "Novo"
-#: ../data/glade/sales_app.glade.h:8 ../data/glade/till.glade.h:10
+#: ../data/glade/sales_app.glade.h:8 ../data/glade/till.glade.h:11
#: ../data/glade/purchase.glade.h:11 ../data/glade/admin.glade.h:10
#: ../data/glade/receivable.glade.h:7 ../data/glade/pos.glade.h:17
#: ../data/glade/warehouse.glade.h:7
@@ -677,14 +677,14 @@
msgid "Gift Certificates..."
msgstr "Vale Compras..."
-#: ../data/glade/sales_app.glade.h:10 ../data/glade/till.glade.h:14
+#: ../data/glade/sales_app.glade.h:10 ../data/glade/till.glade.h:15
#: ../data/glade/purchase.glade.h:13 ../data/glade/admin.glade.h:19
#: ../data/glade/receivable.glade.h:9 ../data/glade/pos.glade.h:26
#: ../data/glade/warehouse.glade.h:9
msgid "Open a file"
msgstr "Abrir Arquivo"
-#: ../data/glade/sales_app.glade.h:11 ../data/glade/till.glade.h:15
+#: ../data/glade/sales_app.glade.h:11 ../data/glade/till.glade.h:16
#: ../data/glade/purchase.glade.h:14 ../data/glade/admin.glade.h:20
#: ../data/glade/receivable.glade.h:10 ../data/glade/pos.glade.h:29
#: ../data/glade/warehouse.glade.h:10
@@ -700,14 +700,14 @@
msgid "Products..."
msgstr "Produtos..."
-#: ../data/glade/sales_app.glade.h:14 ../data/glade/till.glade.h:16
+#: ../data/glade/sales_app.glade.h:14 ../data/glade/till.glade.h:17
#: ../data/glade/purchase.glade.h:17 ../data/glade/admin.glade.h:22
#: ../data/glade/receivable.glade.h:11 ../data/glade/pos.glade.h:34
#: ../data/glade/warehouse.glade.h:12
msgid "Quit"
msgstr "Sair"
-#: ../data/glade/sales_app.glade.h:15 ../data/glade/till.glade.h:17
+#: ../data/glade/sales_app.glade.h:15 ../data/glade/till.glade.h:18
#: ../data/glade/purchase.glade.h:18 ../data/glade/admin.glade.h:23
#: ../data/glade/receivable.glade.h:12 ../data/glade/pos.glade.h:35
#: ../data/glade/warehouse.glade.h:13
@@ -718,14 +718,14 @@
msgid "S_ales"
msgstr "Vend_as"
-#: ../data/glade/sales_app.glade.h:17 ../data/glade/till.glade.h:22
+#: ../data/glade/sales_app.glade.h:17 ../data/glade/till.glade.h:24
#: ../data/glade/purchase.glade.h:20 ../data/glade/admin.glade.h:26
#: ../data/glade/receivable.glade.h:13 ../data/glade/pos.glade.h:44
#: ../data/glade/warehouse.glade.h:19
msgid "Save a file"
msgstr "Salvar Arquivo"
-#: ../data/glade/sales_app.glade.h:18 ../data/glade/till.glade.h:23
+#: ../data/glade/sales_app.glade.h:18 ../data/glade/till.glade.h:25
#: ../data/glade/receivable.glade.h:14
msgid "Save with a different name"
msgstr "Salvar como"
@@ -743,25 +743,25 @@
msgid "Services..."
msgstr "Serviços..."
-#: ../data/glade/sales_app.glade.h:22 ../data/glade/till.glade.h:24
+#: ../data/glade/sales_app.glade.h:22 ../data/glade/till.glade.h:26
#: ../data/glade/receivable.glade.h:15
msgid "Store Cookie"
msgstr "Gravar Cookie"
-#: ../data/glade/sales_app.glade.h:23 ../data/glade/till.glade.h:27
+#: ../data/glade/sales_app.glade.h:23 ../data/glade/till.glade.h:29
#: ../data/glade/purchase.glade.h:28 ../data/glade/admin.glade.h:34
#: ../data/glade/receivable.glade.h:19 ../data/glade/pos.glade.h:51
#: ../data/glade/warehouse.glade.h:23
msgid "_Edit"
msgstr "Editar"
-#: ../data/glade/sales_app.glade.h:24 ../data/glade/till.glade.h:28
+#: ../data/glade/sales_app.glade.h:24 ../data/glade/till.glade.h:30
#: ../data/glade/purchase.glade.h:30 ../data/glade/receivable.glade.h:21
#: ../data/glade/pos.glade.h:52 ../data/glade/warehouse.glade.h:24
msgid "_File"
msgstr "_File"
-#: ../data/glade/sales_app.glade.h:25 ../data/glade/till.glade.h:29
+#: ../data/glade/sales_app.glade.h:25 ../data/glade/till.glade.h:31
#: ../data/glade/purchase.glade.h:31 ../data/glade/receivable.glade.h:22
#: ../data/glade/pos.glade.h:53 ../data/glade/warehouse.glade.h:25
msgid "_Help"
@@ -771,58 +771,66 @@
msgid "_Print Invoice"
msgstr "Im_primir Nota Fiscal"
-#: ../data/glade/sales_app.glade.h:27 ../data/glade/till.glade.h:31
+#: ../data/glade/sales_app.glade.h:27 ../data/glade/till.glade.h:33
#: ../data/glade/purchase.glade.h:35 ../data/glade/admin.glade.h:38
#: ../data/glade/receivable.glade.h:24 ../data/glade/pos.glade.h:56
#: ../data/glade/warehouse.glade.h:28
msgid "_User"
msgstr "_Usuario"
-#: ../data/glade/till.glade.h:5 ../data/glade/pos.glade.h:13
+#: ../data/glade/till.glade.h:2
+msgid "Add cash..."
+msgstr "Suprimento..."
+
+#: ../data/glade/till.glade.h:6 ../data/glade/pos.glade.h:13
msgid "Close Till..."
msgstr "Fechar Caixa..."
-#: ../data/glade/till.glade.h:6
+#: ../data/glade/till.glade.h:7
msgid "Confirm..."
msgstr "Confirmar"
-#: ../data/glade/till.glade.h:9
+#: ../data/glade/till.glade.h:10
msgid "Current Till"
msgstr "Caixa Atual"
-#: ../data/glade/till.glade.h:12
+#: ../data/glade/till.glade.h:13
msgid "Fiscal Till Operations..."
msgstr "Operações Fiscais de Caixa..."
-#: ../data/glade/till.glade.h:13 ../data/glade/pos.glade.h:25
+#: ../data/glade/till.glade.h:14 ../data/glade/pos.glade.h:25
msgid "Open Till..."
msgstr "Abrir Caixa..."
-#: ../data/glade/till.glade.h:18
+#: ../data/glade/till.glade.h:19
+msgid "Remove cash..."
+msgstr "Sangria..."
+
+#: ../data/glade/till.glade.h:20
msgid "Return..."
msgstr "Estornar..."
-#: ../data/glade/till.glade.h:19
+#: ../data/glade/till.glade.h:21
msgid "STOQ - Till Application"
msgstr "STOQ- Aplicação de Caixa"
-#: ../data/glade/till.glade.h:20 ../data/glade/warehouse.glade.h:17
+#: ../data/glade/till.glade.h:22 ../data/glade/warehouse.glade.h:17
msgid "S_earch"
msgstr "P_esquisar"
-#: ../data/glade/till.glade.h:21 ../data/glade/pos.glade.h:41
+#: ../data/glade/till.glade.h:23 ../data/glade/pos.glade.h:41
msgid "Sales..."
msgstr "Vendas..."
-#: ../data/glade/till.glade.h:25
+#: ../data/glade/till.glade.h:27
msgid "Till Opened Since 01/01/2006"
msgstr "Caixa aberto desde 01/01/2006"
-#: ../data/glade/till.glade.h:26
+#: ../data/glade/till.glade.h:28
msgid "Treasury..."
msgstr "Tesouraria..."
-#: ../data/glade/till.glade.h:30
+#: ../data/glade/till.glade.h:32
msgid "_Till"
msgstr "Caixa"
@@ -1447,9 +1455,6 @@
#~ msgid "Date"
#~ msgstr "Data"
-#~ msgid "Add..."
-#~ msgstr "Adicionar..."
-
#~ msgid "Sea_rch"
#~ msgstr "Pesquisar"
Modified: stoq/trunk/po/stoq.pot
==============================================================================
--- stoq/trunk/po/stoq.pot (original)
+++ stoq/trunk/po/stoq.pot Tue Nov 28 11:04:08 2006
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-28 10:47-0200\n"
+"POT-Creation-Date: 2006-11-28 10:48-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -199,21 +199,21 @@
msgid "Purchase"
msgstr ""
-#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:65
+#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:66
msgid "order"
msgstr ""
-#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:65
+#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:66
msgid "orders"
msgstr ""
#: ../stoq/gui/purchase/purchase.py:62 ../stoq/gui/admin/admin.py:61
-#: ../stoq/gui/sales/sales.py:60 ../stoq/gui/till/till.py:66
+#: ../stoq/gui/sales/sales.py:60 ../stoq/gui/till/till.py:67
#: ../stoq/gui/receivable/receivable.py:51
msgid "matching:"
msgstr ""
-#: ../stoq/gui/purchase/purchase.py:63 ../stoq/gui/till/till.py:67
+#: ../stoq/gui/purchase/purchase.py:63 ../stoq/gui/till/till.py:68
msgid "Show orders with status"
msgstr ""
@@ -255,12 +255,12 @@
msgstr ""
#: ../stoq/gui/purchase/purchase.py:213 ../stoq/gui/sales/sales.py:164
-#: ../stoq/gui/till/till.py:198 ../stoq/gui/receivable/receivable.py:95
+#: ../stoq/gui/till/till.py:201 ../stoq/gui/receivable/receivable.py:95
msgid "Number"
msgstr ""
#: ../stoq/gui/purchase/purchase.py:215 ../stoq/gui/sales/sales.py:64
-#: ../stoq/gui/till/till.py:200
+#: ../stoq/gui/till/till.py:203
msgid "Date Started"
msgstr ""
@@ -348,48 +348,48 @@
msgid "Preview Model"
msgstr ""
-#: ../stoq/gui/sales/sales.py:166 ../stoq/gui/till/till.py:202
+#: ../stoq/gui/sales/sales.py:166 ../stoq/gui/till/till.py:205
msgid "Client"
msgstr ""
-#: ../stoq/gui/sales/sales.py:168 ../stoq/gui/till/till.py:204
+#: ../stoq/gui/sales/sales.py:168 ../stoq/gui/till/till.py:207
msgid "Salesperson"
msgstr ""
-#: ../stoq/gui/sales/sales.py:170 ../stoq/gui/till/till.py:206
+#: ../stoq/gui/sales/sales.py:170 ../stoq/gui/till/till.py:209
msgid "Items Quantity"
msgstr ""
-#: ../stoq/gui/sales/sales.py:173 ../stoq/gui/till/till.py:209
+#: ../stoq/gui/sales/sales.py:173 ../stoq/gui/till/till.py:212
#: ../stoq/gui/pos/pos.py:522
msgid "Total"
msgstr ""
-#: ../stoq/gui/till/till.py:60 ../data/glade/pos.glade.h:49
+#: ../stoq/gui/till/till.py:61 ../data/glade/pos.glade.h:49
msgid "Till"
msgstr ""
-#: ../stoq/gui/till/till.py:82 ../stoq/gui/pos/pos.py:128
+#: ../stoq/gui/till/till.py:83 ../stoq/gui/pos/pos.py:128
#, python-format
msgid "Total: %s"
msgstr ""
-#: ../stoq/gui/till/till.py:111
+#: ../stoq/gui/till/till.py:114
msgid "Till Closed"
msgstr ""
-#: ../stoq/gui/till/till.py:117
+#: ../stoq/gui/till/till.py:120
#, python-format
msgid "Till Opened on %s"
msgstr ""
-#: ../stoq/gui/till/till.py:159
+#: ../stoq/gui/till/till.py:162
msgid "Confirm Sale"
msgstr ""
#. XXX The current approch to get the current branch is going to
#. be improved after bug 2621
-#: ../stoq/gui/till/till.py:195
+#: ../stoq/gui/till/till.py:198
#, python-format
msgid "Stoq - Till for Branch %03d"
msgstr ""
@@ -550,7 +550,7 @@
msgid "Company"
msgstr ""
-#: ../data/glade/NewOrderEditor.glade.h:5 ../data/glade/till.glade.h:11
+#: ../data/glade/NewOrderEditor.glade.h:5 ../data/glade/till.glade.h:12
#: ../data/glade/purchase.glade.h:12 ../data/glade/receivable.glade.h:8
msgid "Details"
msgstr ""
@@ -586,12 +586,12 @@
msgid "About"
msgstr ""
-#: ../data/glade/sales_app.glade.h:2 ../data/glade/till.glade.h:2
+#: ../data/glade/sales_app.glade.h:2 ../data/glade/till.glade.h:3
#: ../data/glade/receivable.glade.h:3
msgid "Change User"
msgstr ""
-#: ../data/glade/sales_app.glade.h:3 ../data/glade/till.glade.h:3
+#: ../data/glade/sales_app.glade.h:3 ../data/glade/till.glade.h:4
#: ../data/glade/purchase.glade.h:8 ../data/glade/admin.glade.h:7
#: ../data/glade/receivable.glade.h:4 ../data/glade/warehouse.glade.h:4
msgid "Clear Cookie"
@@ -601,26 +601,26 @@
msgid "Clients"
msgstr ""
-#: ../data/glade/sales_app.glade.h:5 ../data/glade/till.glade.h:4
+#: ../data/glade/sales_app.glade.h:5 ../data/glade/till.glade.h:5
#: ../data/glade/pos.glade.h:12
msgid "Clients..."
msgstr ""
-#: ../data/glade/sales_app.glade.h:6 ../data/glade/till.glade.h:7
+#: ../data/glade/sales_app.glade.h:6 ../data/glade/till.glade.h:8
#: ../data/glade/purchase.glade.h:9 ../data/glade/admin.glade.h:8
#: ../data/glade/receivable.glade.h:5 ../data/glade/pos.glade.h:14
#: ../data/glade/warehouse.glade.h:5
msgid "Copy selected object into the clipboard"
msgstr ""
-#: ../data/glade/sales_app.glade.h:7 ../data/glade/till.glade.h:8
+#: ../data/glade/sales_app.glade.h:7 ../data/glade/till.glade.h:9
#: ../data/glade/purchase.glade.h:10 ../data/glade/admin.glade.h:9
#: ../data/glade/receivable.glade.h:6 ../data/glade/pos.glade.h:15
#: ../data/glade/warehouse.glade.h:6
msgid "Create a new file"
msgstr ""
-#: ../data/glade/sales_app.glade.h:8 ../data/glade/till.glade.h:10
+#: ../data/glade/sales_app.glade.h:8 ../data/glade/till.glade.h:11
#: ../data/glade/purchase.glade.h:11 ../data/glade/admin.glade.h:10
#: ../data/glade/receivable.glade.h:7 ../data/glade/pos.glade.h:17
#: ../data/glade/warehouse.glade.h:7
@@ -631,14 +631,14 @@
msgid "Gift Certificates..."
msgstr ""
-#: ../data/glade/sales_app.glade.h:10 ../data/glade/till.glade.h:14
+#: ../data/glade/sales_app.glade.h:10 ../data/glade/till.glade.h:15
#: ../data/glade/purchase.glade.h:13 ../data/glade/admin.glade.h:19
#: ../data/glade/receivable.glade.h:9 ../data/glade/pos.glade.h:26
#: ../data/glade/warehouse.glade.h:9
msgid "Open a file"
msgstr ""
-#: ../data/glade/sales_app.glade.h:11 ../data/glade/till.glade.h:15
+#: ../data/glade/sales_app.glade.h:11 ../data/glade/till.glade.h:16
#: ../data/glade/purchase.glade.h:14 ../data/glade/admin.glade.h:20
#: ../data/glade/receivable.glade.h:10 ../data/glade/pos.glade.h:29
#: ../data/glade/warehouse.glade.h:10
@@ -654,14 +654,14 @@
msgid "Products..."
msgstr ""
-#: ../data/glade/sales_app.glade.h:14 ../data/glade/till.glade.h:16
+#: ../data/glade/sales_app.glade.h:14 ../data/glade/till.glade.h:17
#: ../data/glade/purchase.glade.h:17 ../data/glade/admin.glade.h:22
#: ../data/glade/receivable.glade.h:11 ../data/glade/pos.glade.h:34
#: ../data/glade/warehouse.glade.h:12
msgid "Quit"
msgstr ""
-#: ../data/glade/sales_app.glade.h:15 ../data/glade/till.glade.h:17
+#: ../data/glade/sales_app.glade.h:15 ../data/glade/till.glade.h:18
#: ../data/glade/purchase.glade.h:18 ../data/glade/admin.glade.h:23
#: ../data/glade/receivable.glade.h:12 ../data/glade/pos.glade.h:35
#: ../data/glade/warehouse.glade.h:13
@@ -672,14 +672,14 @@
msgid "S_ales"
msgstr ""
-#: ../data/glade/sales_app.glade.h:17 ../data/glade/till.glade.h:22
+#: ../data/glade/sales_app.glade.h:17 ../data/glade/till.glade.h:24
#: ../data/glade/purchase.glade.h:20 ../data/glade/admin.glade.h:26
#: ../data/glade/receivable.glade.h:13 ../data/glade/pos.glade.h:44
#: ../data/glade/warehouse.glade.h:19
msgid "Save a file"
msgstr ""
-#: ../data/glade/sales_app.glade.h:18 ../data/glade/till.glade.h:23
+#: ../data/glade/sales_app.glade.h:18 ../data/glade/till.glade.h:25
#: ../data/glade/receivable.glade.h:14
msgid "Save with a different name"
msgstr ""
@@ -697,25 +697,25 @@
msgid "Services..."
msgstr ""
-#: ../data/glade/sales_app.glade.h:22 ../data/glade/till.glade.h:24
+#: ../data/glade/sales_app.glade.h:22 ../data/glade/till.glade.h:26
#: ../data/glade/receivable.glade.h:15
msgid "Store Cookie"
msgstr ""
-#: ../data/glade/sales_app.glade.h:23 ../data/glade/till.glade.h:27
+#: ../data/glade/sales_app.glade.h:23 ../data/glade/till.glade.h:29
#: ../data/glade/purchase.glade.h:28 ../data/glade/admin.glade.h:34
#: ../data/glade/receivable.glade.h:19 ../data/glade/pos.glade.h:51
#: ../data/glade/warehouse.glade.h:23
msgid "_Edit"
msgstr ""
-#: ../data/glade/sales_app.glade.h:24 ../data/glade/till.glade.h:28
+#: ../data/glade/sales_app.glade.h:24 ../data/glade/till.glade.h:30
#: ../data/glade/purchase.glade.h:30 ../data/glade/receivable.glade.h:21
#: ../data/glade/pos.glade.h:52 ../data/glade/warehouse.glade.h:24
msgid "_File"
msgstr ""
-#: ../data/glade/sales_app.glade.h:25 ../data/glade/till.glade.h:29
+#: ../data/glade/sales_app.glade.h:25 ../data/glade/till.glade.h:31
#: ../data/glade/purchase.glade.h:31 ../data/glade/receivable.glade.h:22
#: ../data/glade/pos.glade.h:53 ../data/glade/warehouse.glade.h:25
msgid "_Help"
@@ -725,58 +725,66 @@
msgid "_Print Invoice"
msgstr ""
-#: ../data/glade/sales_app.glade.h:27 ../data/glade/till.glade.h:31
+#: ../data/glade/sales_app.glade.h:27 ../data/glade/till.glade.h:33
#: ../data/glade/purchase.glade.h:35 ../data/glade/admin.glade.h:38
#: ../data/glade/receivable.glade.h:24 ../data/glade/pos.glade.h:56
#: ../data/glade/warehouse.glade.h:28
msgid "_User"
msgstr ""
-#: ../data/glade/till.glade.h:5 ../data/glade/pos.glade.h:13
+#: ../data/glade/till.glade.h:2
+msgid "Add cash..."
+msgstr ""
+
+#: ../data/glade/till.glade.h:6 ../data/glade/pos.glade.h:13
msgid "Close Till..."
msgstr ""
-#: ../data/glade/till.glade.h:6
+#: ../data/glade/till.glade.h:7
msgid "Confirm..."
msgstr ""
-#: ../data/glade/till.glade.h:9
+#: ../data/glade/till.glade.h:10
msgid "Current Till"
msgstr ""
-#: ../data/glade/till.glade.h:12
+#: ../data/glade/till.glade.h:13
msgid "Fiscal Till Operations..."
msgstr ""
-#: ../data/glade/till.glade.h:13 ../data/glade/pos.glade.h:25
+#: ../data/glade/till.glade.h:14 ../data/glade/pos.glade.h:25
msgid "Open Till..."
msgstr ""
-#: ../data/glade/till.glade.h:18
+#: ../data/glade/till.glade.h:19
+msgid "Remove cash..."
+msgstr ""
+
+#: ../data/glade/till.glade.h:20
msgid "Return..."
msgstr ""
-#: ../data/glade/till.glade.h:19
+#: ../data/glade/till.glade.h:21
msgid "STOQ - Till Application"
msgstr ""
-#: ../data/glade/till.glade.h:20 ../data/glade/warehouse.glade.h:17
+#: ../data/glade/till.glade.h:22 ../data/glade/warehouse.glade.h:17
msgid "S_earch"
msgstr ""
-#: ../data/glade/till.glade.h:21 ../data/glade/pos.glade.h:41
+#: ../data/glade/till.glade.h:23 ../data/glade/pos.glade.h:41
msgid "Sales..."
msgstr ""
-#: ../data/glade/till.glade.h:25
+#: ../data/glade/till.glade.h:27
msgid "Till Opened Since 01/01/2006"
msgstr ""
-#: ../data/glade/till.glade.h:26
+#: ../data/glade/till.glade.h:28
msgid "Treasury..."
msgstr ""
-#: ../data/glade/till.glade.h:30
+#: ../data/glade/till.glade.h:32
msgid "_Till"
msgstr ""
Modified: stoq/trunk/po/sv.po
==============================================================================
--- stoq/trunk/po/sv.po (original)
+++ stoq/trunk/po/sv.po Tue Nov 28 11:04:08 2006
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: stoqlib 0.2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-28 10:47-0200\n"
+"POT-Creation-Date: 2006-11-28 10:48-0200\n"
"PO-Revision-Date: 2006-08-25 16:15-0300\n"
"Last-Translator: Johan Dahlin <jdahlin at async.com.br>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -201,21 +201,21 @@
msgid "Purchase"
msgstr "Köp"
-#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:65
+#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:66
msgid "order"
msgstr "order"
-#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:65
+#: ../stoq/gui/purchase/purchase.py:61 ../stoq/gui/till/till.py:66
msgid "orders"
msgstr "order"
#: ../stoq/gui/purchase/purchase.py:62 ../stoq/gui/admin/admin.py:61
-#: ../stoq/gui/sales/sales.py:60 ../stoq/gui/till/till.py:66
+#: ../stoq/gui/sales/sales.py:60 ../stoq/gui/till/till.py:67
#: ../stoq/gui/receivable/receivable.py:51
msgid "matching:"
msgstr ""
-#: ../stoq/gui/purchase/purchase.py:63 ../stoq/gui/till/till.py:67
+#: ../stoq/gui/purchase/purchase.py:63 ../stoq/gui/till/till.py:68
#, fuzzy
msgid "Show orders with status"
msgstr "Ingen produkt vald"
@@ -259,12 +259,12 @@
msgstr ""
#: ../stoq/gui/purchase/purchase.py:213 ../stoq/gui/sales/sales.py:164
-#: ../stoq/gui/till/till.py:198 ../stoq/gui/receivable/receivable.py:95
+#: ../stoq/gui/till/till.py:201 ../stoq/gui/receivable/receivable.py:95
msgid "Number"
msgstr ""
#: ../stoq/gui/purchase/purchase.py:215 ../stoq/gui/sales/sales.py:64
-#: ../stoq/gui/till/till.py:200
+#: ../stoq/gui/till/till.py:203
msgid "Date Started"
msgstr ""
@@ -366,50 +366,50 @@
msgid "Preview Model"
msgstr "Pris"
-#: ../stoq/gui/sales/sales.py:166 ../stoq/gui/till/till.py:202
+#: ../stoq/gui/sales/sales.py:166 ../stoq/gui/till/till.py:205
msgid "Client"
msgstr ""
-#: ../stoq/gui/sales/sales.py:168 ../stoq/gui/till/till.py:204
+#: ../stoq/gui/sales/sales.py:168 ../stoq/gui/till/till.py:207
msgid "Salesperson"
msgstr ""
-#: ../stoq/gui/sales/sales.py:170 ../stoq/gui/till/till.py:206
+#: ../stoq/gui/sales/sales.py:170 ../stoq/gui/till/till.py:209
#, fuzzy
msgid "Items Quantity"
msgstr "Antal"
-#: ../stoq/gui/sales/sales.py:173 ../stoq/gui/till/till.py:209
+#: ../stoq/gui/sales/sales.py:173 ../stoq/gui/till/till.py:212
#: ../stoq/gui/pos/pos.py:522
msgid "Total"
msgstr "Totalt"
-#: ../stoq/gui/till/till.py:60 ../data/glade/pos.glade.h:49
+#: ../stoq/gui/till/till.py:61 ../data/glade/pos.glade.h:49
msgid "Till"
msgstr ""
-#: ../stoq/gui/till/till.py:82 ../stoq/gui/pos/pos.py:128
+#: ../stoq/gui/till/till.py:83 ../stoq/gui/pos/pos.py:128
#, fuzzy, python-format
msgid "Total: %s"
msgstr "Totalt"
-#: ../stoq/gui/till/till.py:111
+#: ../stoq/gui/till/till.py:114
#, fuzzy
msgid "Till Closed"
msgstr "Kod"
-#: ../stoq/gui/till/till.py:117
+#: ../stoq/gui/till/till.py:120
#, python-format
msgid "Till Opened on %s"
msgstr ""
-#: ../stoq/gui/till/till.py:159
+#: ../stoq/gui/till/till.py:162
msgid "Confirm Sale"
msgstr ""
#. XXX The current approch to get the current branch is going to
#. be improved after bug 2621
-#: ../stoq/gui/till/till.py:195
+#: ../stoq/gui/till/till.py:198
#, python-format
msgid "Stoq - Till for Branch %03d"
msgstr ""
@@ -574,7 +574,7 @@
msgid "Company"
msgstr ""
-#: ../data/glade/NewOrderEditor.glade.h:5 ../data/glade/till.glade.h:11
+#: ../data/glade/NewOrderEditor.glade.h:5 ../data/glade/till.glade.h:12
#: ../data/glade/purchase.glade.h:12 ../data/glade/receivable.glade.h:8
msgid "Details"
msgstr ""
@@ -611,12 +611,12 @@
msgid "About"
msgstr ""
-#: ../data/glade/sales_app.glade.h:2 ../data/glade/till.glade.h:2
+#: ../data/glade/sales_app.glade.h:2 ../data/glade/till.glade.h:3
#: ../data/glade/receivable.glade.h:3
msgid "Change User"
msgstr ""
-#: ../data/glade/sales_app.glade.h:3 ../data/glade/till.glade.h:3
+#: ../data/glade/sales_app.glade.h:3 ../data/glade/till.glade.h:4
#: ../data/glade/purchase.glade.h:8 ../data/glade/admin.glade.h:7
#: ../data/glade/receivable.glade.h:4 ../data/glade/warehouse.glade.h:4
msgid "Clear Cookie"
@@ -626,26 +626,26 @@
msgid "Clients"
msgstr ""
-#: ../data/glade/sales_app.glade.h:5 ../data/glade/till.glade.h:4
+#: ../data/glade/sales_app.glade.h:5 ../data/glade/till.glade.h:5
#: ../data/glade/pos.glade.h:12
msgid "Clients..."
msgstr ""
-#: ../data/glade/sales_app.glade.h:6 ../data/glade/till.glade.h:7
+#: ../data/glade/sales_app.glade.h:6 ../data/glade/till.glade.h:8
#: ../data/glade/purchase.glade.h:9 ../data/glade/admin.glade.h:8
#: ../data/glade/receivable.glade.h:5 ../data/glade/pos.glade.h:14
#: ../data/glade/warehouse.glade.h:5
msgid "Copy selected object into the clipboard"
msgstr ""
-#: ../data/glade/sales_app.glade.h:7 ../data/glade/till.glade.h:8
+#: ../data/glade/sales_app.glade.h:7 ../data/glade/till.glade.h:9
#: ../data/glade/purchase.glade.h:10 ../data/glade/admin.glade.h:9
#: ../data/glade/receivable.glade.h:6 ../data/glade/pos.glade.h:15
#: ../data/glade/warehouse.glade.h:6
msgid "Create a new file"
msgstr ""
-#: ../data/glade/sales_app.glade.h:8 ../data/glade/till.glade.h:10
+#: ../data/glade/sales_app.glade.h:8 ../data/glade/till.glade.h:11
#: ../data/glade/purchase.glade.h:11 ../data/glade/admin.glade.h:10
#: ../data/glade/receivable.glade.h:7 ../data/glade/pos.glade.h:17
#: ../data/glade/warehouse.glade.h:7
@@ -656,14 +656,14 @@
msgid "Gift Certificates..."
msgstr ""
-#: ../data/glade/sales_app.glade.h:10 ../data/glade/till.glade.h:14
+#: ../data/glade/sales_app.glade.h:10 ../data/glade/till.glade.h:15
#: ../data/glade/purchase.glade.h:13 ../data/glade/admin.glade.h:19
#: ../data/glade/receivable.glade.h:9 ../data/glade/pos.glade.h:26
#: ../data/glade/warehouse.glade.h:9
msgid "Open a file"
msgstr ""
-#: ../data/glade/sales_app.glade.h:11 ../data/glade/till.glade.h:15
+#: ../data/glade/sales_app.glade.h:11 ../data/glade/till.glade.h:16
#: ../data/glade/purchase.glade.h:14 ../data/glade/admin.glade.h:20
#: ../data/glade/receivable.glade.h:10 ../data/glade/pos.glade.h:29
#: ../data/glade/warehouse.glade.h:10
@@ -679,7 +679,7 @@
msgid "Products..."
msgstr ""
-#: ../data/glade/sales_app.glade.h:14 ../data/glade/till.glade.h:16
+#: ../data/glade/sales_app.glade.h:14 ../data/glade/till.glade.h:17
#: ../data/glade/purchase.glade.h:17 ../data/glade/admin.glade.h:22
#: ../data/glade/receivable.glade.h:11 ../data/glade/pos.glade.h:34
#: ../data/glade/warehouse.glade.h:12
@@ -687,7 +687,7 @@
msgid "Quit"
msgstr "_Avsluta"
-#: ../data/glade/sales_app.glade.h:15 ../data/glade/till.glade.h:17
+#: ../data/glade/sales_app.glade.h:15 ../data/glade/till.glade.h:18
#: ../data/glade/purchase.glade.h:18 ../data/glade/admin.glade.h:23
#: ../data/glade/receivable.glade.h:12 ../data/glade/pos.glade.h:35
#: ../data/glade/warehouse.glade.h:13
@@ -699,14 +699,14 @@
msgid "S_ales"
msgstr "_Försäljning"
-#: ../data/glade/sales_app.glade.h:17 ../data/glade/till.glade.h:22
+#: ../data/glade/sales_app.glade.h:17 ../data/glade/till.glade.h:24
#: ../data/glade/purchase.glade.h:20 ../data/glade/admin.glade.h:26
#: ../data/glade/receivable.glade.h:13 ../data/glade/pos.glade.h:44
#: ../data/glade/warehouse.glade.h:19
msgid "Save a file"
msgstr ""
-#: ../data/glade/sales_app.glade.h:18 ../data/glade/till.glade.h:23
+#: ../data/glade/sales_app.glade.h:18 ../data/glade/till.glade.h:25
#: ../data/glade/receivable.glade.h:14
msgid "Save with a different name"
msgstr ""
@@ -727,25 +727,25 @@
msgid "Services..."
msgstr "Pris"
-#: ../data/glade/sales_app.glade.h:22 ../data/glade/till.glade.h:24
+#: ../data/glade/sales_app.glade.h:22 ../data/glade/till.glade.h:26
#: ../data/glade/receivable.glade.h:15
msgid "Store Cookie"
msgstr ""
-#: ../data/glade/sales_app.glade.h:23 ../data/glade/till.glade.h:27
+#: ../data/glade/sales_app.glade.h:23 ../data/glade/till.glade.h:29
#: ../data/glade/purchase.glade.h:28 ../data/glade/admin.glade.h:34
#: ../data/glade/receivable.glade.h:19 ../data/glade/pos.glade.h:51
#: ../data/glade/warehouse.glade.h:23
msgid "_Edit"
msgstr ""
-#: ../data/glade/sales_app.glade.h:24 ../data/glade/till.glade.h:28
+#: ../data/glade/sales_app.glade.h:24 ../data/glade/till.glade.h:30
#: ../data/glade/purchase.glade.h:30 ../data/glade/receivable.glade.h:21
#: ../data/glade/pos.glade.h:52 ../data/glade/warehouse.glade.h:24
msgid "_File"
msgstr ""
-#: ../data/glade/sales_app.glade.h:25 ../data/glade/till.glade.h:29
+#: ../data/glade/sales_app.glade.h:25 ../data/glade/till.glade.h:31
#: ../data/glade/purchase.glade.h:31 ../data/glade/receivable.glade.h:22
#: ../data/glade/pos.glade.h:53 ../data/glade/warehouse.glade.h:25
msgid "_Help"
@@ -755,60 +755,69 @@
msgid "_Print Invoice"
msgstr ""
-#: ../data/glade/sales_app.glade.h:27 ../data/glade/till.glade.h:31
+#: ../data/glade/sales_app.glade.h:27 ../data/glade/till.glade.h:33
#: ../data/glade/purchase.glade.h:35 ../data/glade/admin.glade.h:38
#: ../data/glade/receivable.glade.h:24 ../data/glade/pos.glade.h:56
#: ../data/glade/warehouse.glade.h:28
msgid "_User"
msgstr "_Användare"
-#: ../data/glade/till.glade.h:5 ../data/glade/pos.glade.h:13
+#: ../data/glade/till.glade.h:2
+msgid "Add cash..."
+msgstr ""
+
+#: ../data/glade/till.glade.h:6 ../data/glade/pos.glade.h:13
msgid "Close Till..."
msgstr ""
-#: ../data/glade/till.glade.h:6
+#: ../data/glade/till.glade.h:7
msgid "Confirm..."
msgstr ""
-#: ../data/glade/till.glade.h:9
+#: ../data/glade/till.glade.h:10
msgid "Current Till"
msgstr ""
-#: ../data/glade/till.glade.h:12
+#: ../data/glade/till.glade.h:13
msgid "Fiscal Till Operations..."
msgstr ""
-#: ../data/glade/till.glade.h:13 ../data/glade/pos.glade.h:25
+#: ../data/glade/till.glade.h:14 ../data/glade/pos.glade.h:25
msgid "Open Till..."
msgstr ""
-#: ../data/glade/till.glade.h:18
+#: ../data/glade/till.glade.h:19
+#, fuzzy
+msgid "Remove cash..."
+msgstr "Ta bort"
+
+#: ../data/glade/till.glade.h:20
msgid "Return..."
msgstr ""
-#: ../data/glade/till.glade.h:19
+#: ../data/glade/till.glade.h:21
msgid "STOQ - Till Application"
msgstr ""
-#: ../data/glade/till.glade.h:20 ../data/glade/warehouse.glade.h:17
+#: ../data/glade/till.glade.h:22 ../data/glade/warehouse.glade.h:17
#, fuzzy
msgid "S_earch"
msgstr "_Sök"
-#: ../data/glade/till.glade.h:21 ../data/glade/pos.glade.h:41
+#: ../data/glade/till.glade.h:23 ../data/glade/pos.glade.h:41
#, fuzzy
msgid "Sales..."
msgstr "_Försäljning"
-#: ../data/glade/till.glade.h:25
+#: ../data/glade/till.glade.h:27
msgid "Till Opened Since 01/01/2006"
msgstr ""
-#: ../data/glade/till.glade.h:26
+#: ../data/glade/till.glade.h:28
msgid "Treasury..."
msgstr ""
-#: ../data/glade/till.glade.h:30
+#: ../data/glade/till.glade.h:32
msgid "_Till"
msgstr ""
Modified: stoq/trunk/stoq/gui/till/till.py
==============================================================================
--- stoq/trunk/stoq/gui/till/till.py (original)
+++ stoq/trunk/stoq/gui/till/till.py Tue Nov 28 11:04:08 2006
@@ -44,6 +44,7 @@
verify_and_open_till,
verify_and_close_till)
from stoqlib.gui.dialogs.saledetails import SaleDetailsDialog
+from stoqlib.gui.editors.tilleditor import CashInEditor, CashOutEditor
from stoqlib.gui.search.personsearch import ClientSearch
from stoqlib.gui.search.salesearch import SaleSearch
from stoqlib.gui.search.tillsearch import TillFiscalOperationsSearch
@@ -104,6 +105,8 @@
has_till = Till.get_current(self.conn) is not None
self.TillClose.set_sensitive(has_till)
self.TillOpen.set_sensitive(not has_till)
+ self.AddCash.set_sensitive(has_till)
+ self.RemoveCash.set_sensitive(has_till)
self.Treasury.set_sensitive(has_till)
till = Till.get_current(self.conn)
@@ -246,6 +249,14 @@
self.run_dialog(dialog, self.conn)
dialog.disconnect(signal_id)
+ def on_AddCash__activate(self, action):
+ model = run_dialog(CashInEditor, self, self.conn)
+ finish_transaction(self.conn, model)
+
+ def on_RemoveCash__activate(self, action):
+ model = run_dialog(CashOutEditor, self, self.conn)
+ finish_transaction(self.conn, model)
+
#
# Callbacks
#
More information about the POS-commit
mailing list