[POS-commit] r8147 - stoqlib/trunk/po
silvio at async.com.br
silvio at async.com.br
Mon Jul 6 15:54:49 BRT 2009
Author: silvio
Date: Mon Jul 6 15:54:49 2009
New Revision: 8147
Log:
Atualização e revisão de tradução
Modified:
stoqlib/trunk/po/es_ES.po
stoqlib/trunk/po/pt_BR.po
stoqlib/trunk/po/stoqlib.pot
stoqlib/trunk/po/sv.po
Modified: stoqlib/trunk/po/es_ES.po
==============================================================================
--- stoqlib/trunk/po/es_ES.po Mon Jul 6 15:54:12 2009 (r8146)
+++ stoqlib/trunk/po/es_ES.po Mon Jul 6 15:54:49 2009 (r8147)
@@ -21,7 +21,7 @@
msgstr ""
"Project-Id-Version: stoq 0.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 10:45-0300\n"
+"POT-Creation-Date: 2009-07-06 15:52-0300\n"
"PO-Revision-Date: 2007-04-09 10:04-0300\n"
"Last-Translator: Rafael Villar Burke <pachi at rvburke.com>\n"
"Language-Team: Spanish <es_ES at li.org>\n"
@@ -29,212 +29,33 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../stoqlib/reporting/payment.py:37
+#: ../stoqlib/reporting/payment.py:35
msgid "Payment Report"
msgstr "Informe de Pago"
-#: ../stoqlib/reporting/payment.py:52 ../stoqlib/reporting/service.py:72
-#: ../stoqlib/reporting/template.py:321 ../stoqlib/reporting/sale.py:111
-#: ../stoqlib/reporting/sale.py:255
-#: ../stoqlib/reporting/purchase_receival.py:63
-#: ../stoqlib/reporting/till.py:64 ../stoqlib/gui/editors/producteditor.py:138
-#: ../stoqlib/gui/search/salesearch.py:91
-#: ../stoqlib/gui/dialogs/tillhistory.py:80
-#: ../stoqlib/gui/dialogs/receivingdialog.py:71
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:92
-#: ../stoqlib/gui/dialogs/saledetails.py:105
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:70
-#: ../stoqlib/gui/dialogs/clientdetails.py:112
-#: ../stoqlib/gui/dialogs/supplierdetails.py:108
-#: ../stoqlib/gui/dialogs/purchasedetails.py:109
-#: ../stoqlib/gui/dialogs/productstockdetails.py:91
-#: ../data/glade/SalesPersonStep.glade.h:9
-#: ../data/glade/SaleDetailsDialog.glade.h:14
-#: ../data/glade/PurchaseItemEditor.glade.h:8
-#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:6
-#: ../data/glade/MultipleMethodSlave.glade.h:5
-#: ../data/glade/RenegotiationDetailsDialog.glade.h:14
-#: ../data/glade/PurchaseDetailsDialog.glade.h:23
-#: ../data/glade/ReceivingItemEditor.glade.h:8
-#: ../data/glade/PurchasePaymentStep.glade.h:4
-#: ../data/glade/SaleQuoteItemEditor.glade.h:6
-msgid "Total:"
-msgstr "Total:"
-
-#: ../stoqlib/reporting/payment.py:65 ../stoqlib/reporting/sale.py:170
-#: ../stoqlib/gui/search/salesearch.py:68
-#: ../stoqlib/gui/search/paymentsearch.py:76
-#: ../stoqlib/gui/wizards/receivingwizard.py:96
-#: ../stoqlib/gui/dialogs/tillhistory.py:61
-msgid "Number"
-msgstr "Número"
-
-#: ../stoqlib/reporting/payment.py:67 ../stoqlib/reporting/payment.py:94
-#: ../stoqlib/reporting/service.py:56 ../stoqlib/reporting/template.py:311
-#: ../stoqlib/reporting/product.py:166 ../stoqlib/reporting/purchase.py:166
-#: ../stoqlib/reporting/till.py:52 ../stoqlib/gui/editors/tilleditor.py:212
-#: ../stoqlib/gui/editors/invoiceeditor.py:228
-#: ../stoqlib/gui/editors/invoiceeditor.py:286
-#: ../stoqlib/gui/editors/sellableeditor.py:102
-#: ../stoqlib/gui/editors/producteditor.py:124
-#: ../stoqlib/gui/search/servicesearch.py:110
-#: ../stoqlib/gui/search/fiscalsearch.py:72
-#: ../stoqlib/gui/search/categorysearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:154
-#: ../stoqlib/gui/search/productsearch.py:229
-#: ../stoqlib/gui/search/productsearch.py:275
-#: ../stoqlib/gui/search/purchasesearch.py:78
-#: ../stoqlib/gui/search/sellablesearch.py:122
-#: ../stoqlib/gui/search/tillsearch.py:118
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:80
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:125
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:88
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:114
-#: ../stoqlib/gui/wizards/salequotewizard.py:169
-#: ../stoqlib/gui/wizards/purchasewizard.py:235
-#: ../stoqlib/gui/wizards/receivingwizard.py:243
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:131
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:465
-#: ../stoqlib/gui/dialogs/quotedialog.py:91
-#: ../stoqlib/gui/dialogs/initialstockdialog.py:83
-#: ../stoqlib/gui/dialogs/openinventorydialog.py:141
-#: ../stoqlib/gui/dialogs/tillhistory.py:65
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:103
-#: ../stoqlib/gui/dialogs/receivingdialog.py:83
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:124
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:142
-#: ../stoqlib/gui/dialogs/productcountingdialog.py:75
-#: ../stoqlib/gui/dialogs/devices.py:50
-#: ../stoqlib/gui/dialogs/saledetails.py:152
-#: ../stoqlib/gui/dialogs/saledetails.py:173
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:81
-#: ../stoqlib/gui/dialogs/clientdetails.py:137
-#: ../stoqlib/gui/dialogs/clientdetails.py:148
-#: ../stoqlib/gui/dialogs/clientdetails.py:159
-#: ../stoqlib/gui/dialogs/supplierdetails.py:131
-#: ../stoqlib/gui/dialogs/supplierdetails.py:144
-#: ../stoqlib/gui/dialogs/purchasedetails.py:157
-#: ../stoqlib/gui/dialogs/purchasedetails.py:170
-#: ../stoqlib/gui/dialogs/purchasedetails.py:186
-#: ../stoqlib/gui/slaves/installmentslave.py:228
-#: ../stoqlib/gui/slaves/paymentslave.py:1035
-msgid "Description"
-msgstr "Descripción"
-
-#: ../stoqlib/reporting/payment.py:69
-#: ../stoqlib/gui/search/fiscalsearch.py:128
-msgid "Drawee"
-msgstr "Retirado"
-
-#: ../stoqlib/reporting/payment.py:72 ../stoqlib/reporting/payment.py:99
-#: ../stoqlib/reporting/payment.py:133 ../stoqlib/reporting/purchase.py:168
-msgid "Due date"
-msgstr "Fecha de vencimiento:"
-
-#: ../stoqlib/reporting/payment.py:74 ../stoqlib/reporting/payment.py:101
-#: ../stoqlib/reporting/payment.py:135
-#: ../stoqlib/gui/slaves/installmentslave.py:230
-msgid "Paid date"
-msgstr "Fecha de pago"
-
-#: ../stoqlib/reporting/payment.py:76 ../stoqlib/reporting/payment.py:103
-#: ../stoqlib/reporting/payment.py:137 ../stoqlib/reporting/sale.py:182
-#: ../stoqlib/gui/search/personsearch.py:116
-#: ../stoqlib/gui/search/personsearch.py:336
-#: ../stoqlib/gui/search/paymentsearch.py:82
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:133
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:92
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:131
-#: ../stoqlib/gui/dialogs/saledetails.py:159
-#: ../stoqlib/gui/dialogs/clientdetails.py:129
-#: ../stoqlib/gui/dialogs/clientdetails.py:164
-#: ../stoqlib/gui/dialogs/supplierdetails.py:123
-#: ../stoqlib/gui/dialogs/supplierdetails.py:149
-#: ../stoqlib/gui/dialogs/purchasedetails.py:194
-#: ../stoqlib/domain/payment/views.py:262
-msgid "Status"
-msgstr "Situación"
-
-#: ../stoqlib/reporting/payment.py:78 ../stoqlib/reporting/payment.py:105
-#: ../stoqlib/reporting/payment.py:139 ../stoqlib/reporting/purchase.py:170
-#: ../stoqlib/reporting/sale.py:235 ../stoqlib/reporting/till.py:56
+#: ../stoqlib/reporting/payment.py:48 ../stoqlib/reporting/purchase.py:169
+#: ../stoqlib/reporting/sale.py:191 ../stoqlib/reporting/till.py:49
#: ../stoqlib/gui/search/tillsearch.py:124
#: ../stoqlib/gui/search/paymentsearch.py:85
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:134
#: ../stoqlib/gui/wizards/renegotiationwizard.py:93
#: ../stoqlib/gui/dialogs/tillhistory.py:68
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:132
-#: ../stoqlib/gui/dialogs/saledetails.py:160
+#: ../stoqlib/gui/dialogs/saledetails.py:153
#: ../stoqlib/gui/dialogs/clientdetails.py:166
#: ../stoqlib/gui/dialogs/supplierdetails.py:151
-#: ../stoqlib/gui/dialogs/purchasedetails.py:195
-#: ../stoqlib/gui/slaves/installmentslave.py:231
+#: ../stoqlib/gui/dialogs/purchasedetails.py:178
+#: ../stoqlib/gui/slaves/installmentslave.py:247
#: ../stoqlib/gui/slaves/paymentslave.py:1037
#: ../plugins/ecf/deviceconstanteditor.py:136
msgid "Value"
msgstr "Valor"
-#: ../stoqlib/reporting/payment.py:92 ../stoqlib/reporting/payment.py:119
-#: ../stoqlib/reporting/purchase.py:162
-#: ../stoqlib/gui/search/fiscalsearch.py:121
-#: ../stoqlib/gui/search/transfersearch.py:89
-#: ../stoqlib/gui/search/tillsearch.py:113
-#: ../stoqlib/gui/search/paymentsearch.py:68
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:87
-#: ../stoqlib/gui/dialogs/clientdetails.py:122
-#: ../stoqlib/gui/dialogs/clientdetails.py:154
-#: ../stoqlib/gui/dialogs/supplierdetails.py:118
-#: ../stoqlib/gui/dialogs/supplierdetails.py:139
-#: ../stoqlib/gui/dialogs/productstockdetails.py:127
-#: ../stoqlib/gui/dialogs/productstockdetails.py:142
-#: ../stoqlib/gui/dialogs/productstockdetails.py:156
-#: ../stoqlib/gui/dialogs/productstockdetails.py:172
-msgid "#"
-msgstr "#"
-
-#: ../stoqlib/reporting/payment.py:96
-#: ../stoqlib/reporting/purchase_receival.py:50
-#: ../stoqlib/gui/editors/personeditor.py:249
-#: ../stoqlib/gui/editors/producteditor.py:370
-#: ../stoqlib/gui/editors/producteditor.py:390
-#: ../stoqlib/gui/search/receivingsearch.py:81
-#: ../stoqlib/gui/wizards/receivingwizard.py:102
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:183
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:352
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:467
-#: ../stoqlib/gui/dialogs/productstockdetails.py:133
-msgid "Supplier"
-msgstr "Suministrador"
-
-#: ../stoqlib/reporting/payment.py:121
-#: ../stoqlib/gui/search/paymentsearch.py:70
-#, fuzzy
-msgid "Bank"
-msgstr "Banco:"
-
-#: ../stoqlib/reporting/payment.py:124
-#: ../stoqlib/reporting/purchase_receival.py:52
-#: ../stoqlib/gui/editors/personeditor.py:297
-#: ../stoqlib/gui/search/stationsearch.py:63 ../stoqlib/gui/base/search.py:303
-msgid "Branch"
-msgstr "Unidad"
-
-#: ../stoqlib/reporting/payment.py:127
-#: ../stoqlib/gui/search/paymentsearch.py:74
-#, fuzzy
-msgid "Account"
-msgstr "Cuenta:"
-
-#: ../stoqlib/reporting/payment.py:130
-#, fuzzy
-msgid "Payment number"
-msgstr "Tipo de Pago"
-
#: ../stoqlib/reporting/receival_receipt.py:39
msgid "Receival receipt"
msgstr "Fecha de llegada"
-#: ../stoqlib/reporting/service.py:41 ../stoqlib/reporting/service.py:81
+#: ../stoqlib/reporting/service.py:41 ../stoqlib/reporting/service.py:63
#, fuzzy
msgid "Service Listing"
msgstr "Servicios"
@@ -246,79 +67,27 @@
msgstr "en la unidad <u>%s</u>"
#: ../stoqlib/reporting/service.py:43
-#: ../stoqlib/gui/search/servicesearch.py:55
+#: ../stoqlib/gui/search/servicesearch.py:56
msgid "services"
msgstr "servicios"
-#. XXX Bug #2430 will improve this part
-#: ../stoqlib/reporting/service.py:55 ../stoqlib/reporting/template.py:310
-#: ../stoqlib/reporting/product.py:165 ../stoqlib/reporting/sale.py:81
-#: ../stoqlib/reporting/sale.py:226 ../stoqlib/reporting/till.py:50
-#: ../stoqlib/gui/editors/producteditor.py:119
-#: ../stoqlib/gui/search/servicesearch.py:106
-#: ../stoqlib/gui/search/productsearch.py:148
-#: ../stoqlib/gui/search/productsearch.py:227
-#: ../stoqlib/gui/search/productsearch.py:271
-#: ../stoqlib/gui/search/sellablesearch.py:118
-#: ../stoqlib/gui/wizards/purchasewizard.py:234
-#: ../stoqlib/gui/dialogs/initialstockdialog.py:81
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:101
-#: ../stoqlib/gui/dialogs/receivingdialog.py:81
-#: ../stoqlib/gui/dialogs/productcountingdialog.py:73
-#: ../stoqlib/gui/dialogs/saledetails.py:170
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:79
-#: ../stoqlib/gui/dialogs/clientdetails.py:135
-#: ../stoqlib/gui/dialogs/clientdetails.py:145
-#: ../stoqlib/gui/dialogs/supplierdetails.py:129
-msgid "Code"
-msgstr "Código"
-
-#: ../stoqlib/reporting/service.py:57 ../stoqlib/reporting/product.py:66
-#: ../stoqlib/reporting/purchase.py:102 ../stoqlib/reporting/purchase.py:233
+#: ../stoqlib/reporting/service.py:55 ../stoqlib/reporting/product.py:66
+#: ../stoqlib/reporting/purchase.py:102 ../stoqlib/reporting/purchase.py:232
#: ../stoqlib/gui/editors/producteditor.py:395
-#: ../stoqlib/gui/search/servicesearch.py:114
-#: ../stoqlib/gui/search/productsearch.py:163
+#: ../stoqlib/gui/search/servicesearch.py:115
+#: ../stoqlib/gui/search/productsearch.py:165
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:88
-#: ../stoqlib/gui/wizards/purchasewizard.py:245
-#: ../stoqlib/gui/wizards/receivingwizard.py:251
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:472
+#: ../stoqlib/gui/wizards/purchasewizard.py:251
+#: ../stoqlib/gui/wizards/receivingwizard.py:253
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:475
#: ../stoqlib/gui/dialogs/quotedialog.py:95
#: ../stoqlib/gui/dialogs/receivingdialog.py:88
#: ../stoqlib/gui/dialogs/transferorderdialog.py:85
-#: ../stoqlib/gui/dialogs/purchasedetails.py:163
-#: ../stoqlib/gui/dialogs/purchasedetails.py:177
+#: ../stoqlib/gui/dialogs/purchasedetails.py:146
+#: ../stoqlib/gui/dialogs/purchasedetails.py:160
msgid "Cost"
msgstr "Coste"
-#: ../stoqlib/reporting/service.py:58 ../stoqlib/reporting/template.py:313
-#: ../stoqlib/reporting/product.py:67 ../stoqlib/reporting/sale.py:88
-#: ../stoqlib/gui/search/servicesearch.py:118
-#: ../stoqlib/gui/search/productsearch.py:166
-#: ../stoqlib/gui/search/sellablesearch.py:124
-#: ../stoqlib/gui/wizards/salequotewizard.py:177
-#: ../stoqlib/gui/dialogs/saledetails.py:177
-msgid "Price"
-msgstr "Precio"
-
-#: ../stoqlib/reporting/service.py:59
-msgid "C.M."
-msgstr ""
-
-#. FIXME: This column should be virtual, waiting for bug #2764
-#: ../stoqlib/reporting/service.py:62 ../stoqlib/reporting/product.py:172
-#: ../stoqlib/gui/editors/producteditor.py:123
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:86
-#: ../stoqlib/gui/wizards/salequotewizard.py:175
-#: ../stoqlib/gui/wizards/purchasewizard.py:243
-#: ../stoqlib/gui/wizards/receivingwizard.py:249
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:135
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:105
-#: ../stoqlib/gui/dialogs/productstockdetails.py:139
-#: ../stoqlib/gui/dialogs/productstockdetails.py:153
-#: ../plugins/ecf/ecfdomain.py:248
-msgid "Unit"
-msgstr "Unidad"
-
#: ../stoqlib/reporting/template.py:122
#, python-format
msgid "Phone: %s"
@@ -357,6 +126,112 @@
msgid "Totals:"
msgstr "Totales:"
+#. XXX Bug #2430 will improve this part
+#: ../stoqlib/reporting/template.py:310 ../stoqlib/reporting/product.py:165
+#: ../stoqlib/reporting/sale.py:80 ../stoqlib/reporting/sale.py:182
+#: ../stoqlib/gui/editors/producteditor.py:119
+#: ../stoqlib/gui/search/servicesearch.py:107
+#: ../stoqlib/gui/search/productsearch.py:149
+#: ../stoqlib/gui/search/productsearch.py:229
+#: ../stoqlib/gui/search/productsearch.py:273
+#: ../stoqlib/gui/search/sellablesearch.py:119
+#: ../stoqlib/gui/wizards/purchasewizard.py:240
+#: ../stoqlib/gui/dialogs/initialstockdialog.py:81
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:101
+#: ../stoqlib/gui/dialogs/receivingdialog.py:81
+#: ../stoqlib/gui/dialogs/productcountingdialog.py:73
+#: ../stoqlib/gui/dialogs/saledetails.py:163
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:79
+#: ../stoqlib/gui/dialogs/clientdetails.py:135
+#: ../stoqlib/gui/dialogs/clientdetails.py:145
+#: ../stoqlib/gui/dialogs/supplierdetails.py:129
+msgid "Code"
+msgstr "Código"
+
+#: ../stoqlib/reporting/template.py:311 ../stoqlib/reporting/product.py:166
+#: ../stoqlib/reporting/purchase.py:165
+#: ../stoqlib/gui/editors/tilleditor.py:212
+#: ../stoqlib/gui/editors/invoiceeditor.py:228
+#: ../stoqlib/gui/editors/invoiceeditor.py:286
+#: ../stoqlib/gui/editors/sellableeditor.py:102
+#: ../stoqlib/gui/editors/producteditor.py:124
+#: ../stoqlib/gui/search/servicesearch.py:111
+#: ../stoqlib/gui/search/fiscalsearch.py:72
+#: ../stoqlib/gui/search/categorysearch.py:63
+#: ../stoqlib/gui/search/productsearch.py:156
+#: ../stoqlib/gui/search/productsearch.py:231
+#: ../stoqlib/gui/search/productsearch.py:277
+#: ../stoqlib/gui/search/purchasesearch.py:78
+#: ../stoqlib/gui/search/sellablesearch.py:124
+#: ../stoqlib/gui/search/tillsearch.py:118
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:80
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:125
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:88
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:114
+#: ../stoqlib/gui/wizards/salequotewizard.py:169
+#: ../stoqlib/gui/wizards/purchasewizard.py:241
+#: ../stoqlib/gui/wizards/receivingwizard.py:245
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:132
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:468
+#: ../stoqlib/gui/dialogs/quotedialog.py:91
+#: ../stoqlib/gui/dialogs/initialstockdialog.py:83
+#: ../stoqlib/gui/dialogs/openinventorydialog.py:141
+#: ../stoqlib/gui/dialogs/tillhistory.py:65
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:103
+#: ../stoqlib/gui/dialogs/receivingdialog.py:83
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:124
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:142
+#: ../stoqlib/gui/dialogs/productcountingdialog.py:75
+#: ../stoqlib/gui/dialogs/devices.py:50
+#: ../stoqlib/gui/dialogs/saledetails.py:145
+#: ../stoqlib/gui/dialogs/saledetails.py:166
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:81
+#: ../stoqlib/gui/dialogs/clientdetails.py:137
+#: ../stoqlib/gui/dialogs/clientdetails.py:148
+#: ../stoqlib/gui/dialogs/clientdetails.py:159
+#: ../stoqlib/gui/dialogs/supplierdetails.py:131
+#: ../stoqlib/gui/dialogs/supplierdetails.py:144
+#: ../stoqlib/gui/dialogs/purchasedetails.py:140
+#: ../stoqlib/gui/dialogs/purchasedetails.py:153
+#: ../stoqlib/gui/dialogs/purchasedetails.py:169
+#: ../stoqlib/gui/slaves/installmentslave.py:244
+#: ../stoqlib/gui/slaves/paymentslave.py:1035
+msgid "Description"
+msgstr "Descripción"
+
+#: ../stoqlib/reporting/template.py:313 ../stoqlib/reporting/product.py:67
+#: ../stoqlib/reporting/sale.py:87 ../stoqlib/gui/search/servicesearch.py:119
+#: ../stoqlib/gui/search/productsearch.py:168
+#: ../stoqlib/gui/search/sellablesearch.py:126
+#: ../stoqlib/gui/wizards/salequotewizard.py:177
+#: ../stoqlib/gui/dialogs/saledetails.py:170
+msgid "Price"
+msgstr "Precio"
+
+#: ../stoqlib/reporting/template.py:321 ../stoqlib/reporting/sale.py:110
+#: ../stoqlib/reporting/sale.py:211
+#: ../stoqlib/gui/editors/producteditor.py:138
+#: ../stoqlib/gui/search/salesearch.py:91
+#: ../stoqlib/gui/dialogs/tillhistory.py:80
+#: ../stoqlib/gui/dialogs/receivingdialog.py:71
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:92
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:70
+#: ../stoqlib/gui/dialogs/clientdetails.py:112
+#: ../stoqlib/gui/dialogs/supplierdetails.py:108
+#: ../stoqlib/gui/dialogs/productstockdetails.py:91
+#: ../data/glade/SalesPersonStep.glade.h:9
+#: ../data/glade/SaleDetailsDialog.glade.h:17
+#: ../data/glade/PurchaseItemEditor.glade.h:8
+#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:6
+#: ../data/glade/MultipleMethodSlave.glade.h:5
+#: ../data/glade/RenegotiationDetailsDialog.glade.h:14
+#: ../data/glade/PurchaseDetailsDialog.glade.h:24
+#: ../data/glade/ReceivingItemEditor.glade.h:8
+#: ../data/glade/PurchasePaymentStep.glade.h:4
+#: ../data/glade/SaleQuoteItemEditor.glade.h:6
+msgid "Total:"
+msgstr "Total:"
+
#: ../stoqlib/reporting/template.py:333
msgid "Untitled"
msgstr "Sin título"
@@ -378,42 +253,43 @@
msgstr ""
#: ../stoqlib/reporting/product.py:68
-#: ../stoqlib/gui/search/productsearch.py:169
+#: ../stoqlib/gui/search/productsearch.py:171
msgid "Stock Total"
msgstr "Stock Total"
#: ../stoqlib/reporting/product.py:92 ../stoqlib/reporting/product.py:170
-#: ../stoqlib/reporting/purchase.py:104 ../stoqlib/reporting/purchase.py:234
-#: ../stoqlib/reporting/sale.py:86 ../stoqlib/gui/editors/producteditor.py:121
+#: ../stoqlib/reporting/purchase.py:104 ../stoqlib/reporting/purchase.py:233
+#: ../stoqlib/reporting/sale.py:85 ../stoqlib/gui/editors/producteditor.py:121
+#: ../stoqlib/gui/search/salesearch.py:136
#: ../stoqlib/gui/wizards/salequotewizard.py:173
-#: ../stoqlib/gui/wizards/purchasewizard.py:239
-#: ../stoqlib/gui/wizards/receivingwizard.py:245
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:133
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:469
+#: ../stoqlib/gui/wizards/purchasewizard.py:245
+#: ../stoqlib/gui/wizards/receivingwizard.py:247
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:134
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:472
#: ../stoqlib/gui/dialogs/quotedialog.py:93
#: ../stoqlib/gui/dialogs/receivingdialog.py:85
-#: ../stoqlib/gui/dialogs/saledetails.py:175
+#: ../stoqlib/gui/dialogs/saledetails.py:168
#: ../stoqlib/gui/dialogs/transferorderdialog.py:83
-#: ../stoqlib/gui/dialogs/purchasedetails.py:160
+#: ../stoqlib/gui/dialogs/purchasedetails.py:143
#: ../stoqlib/gui/dialogs/productstockdetails.py:137
msgid "Quantity"
msgstr "Cantidad"
#: ../stoqlib/reporting/product.py:119 ../stoqlib/reporting/product.py:189
-#: ../stoqlib/gui/search/productsearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:249
+#: ../stoqlib/gui/search/productsearch.py:64
+#: ../stoqlib/gui/search/productsearch.py:251
msgid "products"
msgstr "productos"
#: ../stoqlib/reporting/product.py:136
-#: ../stoqlib/gui/search/productsearch.py:231
+#: ../stoqlib/gui/search/productsearch.py:233
#: ../stoqlib/gui/dialogs/productstockdetails.py:150
-#: ../stoqlib/domain/sellable.py:250
+#: ../stoqlib/domain/sellable.py:248
msgid "Sold"
msgstr "Vendido"
#: ../stoqlib/reporting/product.py:137 ../stoqlib/reporting/purchase.py:68
-#: ../stoqlib/gui/search/productsearch.py:238
+#: ../stoqlib/gui/search/productsearch.py:240
#: ../stoqlib/gui/search/purchasesearch.py:82
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:84
#: ../data/glade/PurchaseDetailsDialog.glade.h:18
@@ -421,14 +297,14 @@
msgstr "Recibido"
#: ../stoqlib/reporting/product.py:138
-#: ../stoqlib/gui/search/productsearch.py:234
+#: ../stoqlib/gui/search/productsearch.py:236
#: ../stoqlib/gui/dialogs/productstockdetails.py:168
#, fuzzy
msgid "Transfered"
msgstr "Transportista"
#: ../stoqlib/reporting/product.py:140
-#: ../stoqlib/gui/search/productsearch.py:236
+#: ../stoqlib/gui/search/productsearch.py:238
#, fuzzy
msgid "Retained"
msgstr "Devuelto"
@@ -449,31 +325,46 @@
msgid "Fiscal Class"
msgstr ""
+#. FIXME: This column should be virtual, waiting for bug #2764
+#: ../stoqlib/reporting/product.py:172
+#: ../stoqlib/gui/editors/producteditor.py:123
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:86
+#: ../stoqlib/gui/wizards/salequotewizard.py:175
+#: ../stoqlib/gui/wizards/purchasewizard.py:249
+#: ../stoqlib/gui/wizards/receivingwizard.py:251
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:136
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:105
+#: ../stoqlib/gui/dialogs/productstockdetails.py:139
+#: ../stoqlib/gui/dialogs/productstockdetails.py:153
+#: ../plugins/ecf/ecfdomain.py:248
+msgid "Unit"
+msgstr "Unidad"
+
#: ../stoqlib/reporting/product.py:188
#, fuzzy
msgid "Product Stock Report"
msgstr "Productos para Entregar:"
#: ../stoqlib/reporting/product.py:208
-#: ../stoqlib/gui/search/productsearch.py:279
+#: ../stoqlib/gui/search/productsearch.py:281
msgid "Maximum"
msgstr ""
#: ../stoqlib/reporting/product.py:209
-#: ../stoqlib/gui/search/productsearch.py:282
+#: ../stoqlib/gui/search/productsearch.py:284
#, fuzzy
msgid "Minimum"
msgstr "Compras"
#: ../stoqlib/reporting/product.py:210
-#: ../stoqlib/gui/search/productsearch.py:284
+#: ../stoqlib/gui/search/productsearch.py:286
#: ../stoqlib/gui/search/purchasesearch.py:84
#, fuzzy
msgid "In Stock"
msgstr "Stock"
#: ../stoqlib/reporting/product.py:212
-#: ../stoqlib/gui/search/productsearch.py:286
+#: ../stoqlib/gui/search/productsearch.py:288
#, fuzzy
msgid "To Receive"
msgstr "Total Recibido:"
@@ -486,51 +377,50 @@
msgid "orders"
msgstr "pedidos"
-#: ../stoqlib/reporting/purchase.py:48 ../stoqlib/reporting/sale.py:154
+#: ../stoqlib/reporting/purchase.py:48 ../stoqlib/reporting/sale.py:137
#, python-format
msgid "with status <u>%s</u>"
msgstr "en estado <u>%s</u>"
#: ../stoqlib/reporting/purchase.py:66
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:82
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:470
-#: ../stoqlib/domain/sale.py:278
-#: ../data/glade/PurchaseDetailsDialog.glade.h:15
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:473
+#: ../stoqlib/domain/sale.py:280
+#: ../data/glade/PurchaseDetailsDialog.glade.h:14
msgid "Ordered"
msgstr "Valor solicitado"
#: ../stoqlib/reporting/purchase.py:70 ../stoqlib/reporting/purchase.py:106
-#: ../stoqlib/reporting/purchase.py:111 ../stoqlib/reporting/purchase.py:236
-#: ../stoqlib/reporting/sale.py:179 ../stoqlib/gui/search/salesearch.py:80
+#: ../stoqlib/reporting/purchase.py:111 ../stoqlib/reporting/purchase.py:235
+#: ../stoqlib/reporting/sale.py:149 ../stoqlib/gui/search/salesearch.py:80
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:89
#: ../stoqlib/gui/wizards/stocktransferwizard.py:120
#: ../stoqlib/gui/wizards/salequotewizard.py:179
-#: ../stoqlib/gui/wizards/purchasewizard.py:247
-#: ../stoqlib/gui/wizards/receivingwizard.py:253
+#: ../stoqlib/gui/wizards/purchasewizard.py:253
+#: ../stoqlib/gui/wizards/receivingwizard.py:255
#: ../stoqlib/gui/dialogs/receivingdialog.py:91
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:146
-#: ../stoqlib/gui/dialogs/saledetails.py:178
+#: ../stoqlib/gui/dialogs/saledetails.py:171
#: ../stoqlib/gui/dialogs/clientdetails.py:131
#: ../stoqlib/gui/dialogs/supplierdetails.py:125
-#: ../stoqlib/gui/dialogs/purchasedetails.py:129
-#: ../stoqlib/gui/dialogs/purchasedetails.py:165
-#: ../stoqlib/gui/dialogs/purchasedetails.py:180
+#: ../stoqlib/gui/dialogs/purchasedetails.py:112
+#: ../stoqlib/gui/dialogs/purchasedetails.py:148
+#: ../stoqlib/gui/dialogs/purchasedetails.py:163
msgid "Total"
msgstr "Total"
#: ../stoqlib/reporting/purchase.py:81
-#: ../stoqlib/reporting/purchase_receival.py:48
#: ../stoqlib/gui/dialogs/productstockdetails.py:131
msgid "Purchase Order"
msgstr "Pedido de Compra"
-#: ../stoqlib/reporting/purchase.py:95 ../stoqlib/reporting/purchase.py:228
-#: ../stoqlib/reporting/sale.py:83
+#: ../stoqlib/reporting/purchase.py:95 ../stoqlib/reporting/purchase.py:227
+#: ../stoqlib/reporting/sale.py:82 ../stoqlib/gui/search/salesearch.py:127
msgid "Item"
msgstr "Artículo"
#: ../stoqlib/reporting/purchase.py:109
-#: ../stoqlib/gui/wizards/receivingwizard.py:108
+#: ../stoqlib/gui/wizards/receivingwizard.py:109
msgid "Qty Received"
msgstr "Cantidad Recibida"
@@ -538,52 +428,72 @@
msgid "Purchase Ordered Items"
msgstr "Artículos del Pedido de Compra"
-#: ../stoqlib/reporting/purchase.py:138 ../stoqlib/reporting/purchase.py:193
-#: ../stoqlib/domain/sale.py:559
+#: ../stoqlib/reporting/purchase.py:138 ../stoqlib/reporting/purchase.py:192
+#: ../stoqlib/domain/sale.py:578
msgid "Not Specified"
msgstr "No especificado"
-#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:239
-#: ../data/glade/PurchaseDetailsDialog.glade.h:24
+#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:238
+#: ../data/glade/PurchaseDetailsDialog.glade.h:25
#: ../data/glade/FinishPurchaseStep.glade.h:6
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:15
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:18
msgid "Transporter:"
msgstr "Transportista:"
-#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:240
-#: ../data/glade/PurchaseDetailsDialog.glade.h:9
-#: ../data/glade/StartPurchaseStep.glade.h:9
+#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:239
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:6
#: ../data/glade/TransporterDataSlave.glade.h:4
msgid "Freight:"
msgstr "Flete:"
-#: ../stoqlib/reporting/purchase.py:154
+#: ../stoqlib/reporting/purchase.py:153
#, fuzzy, python-format
msgid "Payments: %d installments"
msgstr "Pago con %s en %d plazos"
-#: ../stoqlib/reporting/purchase.py:157
+#: ../stoqlib/reporting/purchase.py:156
#, fuzzy
msgid "Payments: 1 installment"
msgstr "Pago con %s en %d plazos"
-#: ../stoqlib/reporting/purchase.py:164
+#: ../stoqlib/reporting/purchase.py:161
+#: ../stoqlib/gui/search/fiscalsearch.py:121
+#: ../stoqlib/gui/search/transfersearch.py:89
+#: ../stoqlib/gui/search/tillsearch.py:113
+#: ../stoqlib/gui/search/paymentsearch.py:68
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:87
+#: ../stoqlib/gui/dialogs/clientdetails.py:122
+#: ../stoqlib/gui/dialogs/clientdetails.py:154
+#: ../stoqlib/gui/dialogs/supplierdetails.py:118
+#: ../stoqlib/gui/dialogs/supplierdetails.py:139
+#: ../stoqlib/gui/dialogs/productstockdetails.py:127
+#: ../stoqlib/gui/dialogs/productstockdetails.py:142
+#: ../stoqlib/gui/dialogs/productstockdetails.py:156
+#: ../stoqlib/gui/dialogs/productstockdetails.py:172
+msgid "#"
+msgstr "#"
+
+#: ../stoqlib/reporting/purchase.py:163
#, fuzzy
msgid "Method"
msgstr "Lesoto"
-#: ../stoqlib/reporting/purchase.py:181 ../stoqlib/reporting/purchase.py:247
+#: ../stoqlib/reporting/purchase.py:167
+msgid "Due date"
+msgstr "Fecha de vencimiento:"
+
+#: ../stoqlib/reporting/purchase.py:180 ../stoqlib/reporting/purchase.py:246
#: ../data/glade/TillClosing.glade.h:5
-#: ../data/glade/SaleDetailsDialog.glade.h:8
+#: ../data/glade/SaleDetailsDialog.glade.h:9
#: ../data/glade/OpenInventoryDialog.glade.h:3
#: ../data/glade/RenegotiationDetailsDialog.glade.h:8
-#: ../data/glade/PurchaseDetailsDialog.glade.h:12
-#: ../data/glade/StartPurchaseStep.glade.h:10
+#: ../data/glade/PurchaseDetailsDialog.glade.h:11
+#: ../data/glade/StartPurchaseStep.glade.h:8
msgid "Open Date:"
msgstr "Fecha de apertura:"
-#: ../stoqlib/reporting/purchase.py:182
-#: ../data/glade/SaleDetailsDialog.glade.h:11
+#: ../stoqlib/reporting/purchase.py:181
+#: ../data/glade/SaleDetailsDialog.glade.h:13
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:9
#: ../data/glade/RenegotiationDetailsDialog.glade.h:11
#: ../data/glade/PaymentChangeDialog.glade.h:4
@@ -594,20 +504,20 @@
msgid "Status:"
msgstr "Estado:"
-#: ../stoqlib/reporting/purchase.py:183 ../stoqlib/reporting/purchase.py:250
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:334
+#: ../stoqlib/reporting/purchase.py:182 ../stoqlib/reporting/purchase.py:249
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:336
#: ../stoqlib/gui/dialogs/paymentchangedialog.py:71
#: ../data/glade/PurchaseDetailsDialog.glade.h:21
-#: ../data/glade/StartPurchaseStep.glade.h:12
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:14
+#: ../data/glade/StartPurchaseStep.glade.h:10
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:17
#: ../data/glade/SupplierDetailsDialog.glade.h:7
msgid "Supplier:"
msgstr "Suministrador:"
-#: ../stoqlib/reporting/purchase.py:184 ../stoqlib/reporting/purchase.py:251
+#: ../stoqlib/reporting/purchase.py:183 ../stoqlib/reporting/purchase.py:250
#: ../data/glade/OpenInventoryDialog.glade.h:1
-#: ../data/glade/PurchaseDetailsDialog.glade.h:4
-#: ../data/glade/StartPurchaseStep.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:2
+#: ../data/glade/StartPurchaseStep.glade.h:3
#: ../data/glade/StationEditor.glade.h:2
#: ../data/glade/ProductsAdjustment.glade.h:1
#: ../data/glade/ReceivingInvoiceSlave.glade.h:1
@@ -615,77 +525,77 @@
msgid "Branch:"
msgstr "Unidad:"
-#: ../stoqlib/reporting/purchase.py:194
+#: ../stoqlib/reporting/purchase.py:193
#, python-format
msgid "Expected Receival Date: %s"
msgstr "Fecha esperada de entrega: %s"
-#: ../stoqlib/reporting/purchase.py:209
+#: ../stoqlib/reporting/purchase.py:208
#, python-format
msgid "Purchase Order #%s"
msgstr "Pedido de Compra %s"
-#: ../stoqlib/reporting/purchase.py:215
+#: ../stoqlib/reporting/purchase.py:214
msgid "Quote Request"
msgstr ""
#. To be filled
-#: ../stoqlib/reporting/purchase.py:249 ../data/glade/StartQuoteStep.glade.h:2
+#: ../stoqlib/reporting/purchase.py:248 ../data/glade/StartQuoteStep.glade.h:2
msgid "Deadline:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:260
+#: ../stoqlib/reporting/purchase.py:259
#, fuzzy
msgid "Payment Settings"
msgstr "Configuración de formas de pago"
-#: ../stoqlib/reporting/purchase.py:264
-#: ../data/glade/PurchaseDetailsDialog.glade.h:16
+#: ../stoqlib/reporting/purchase.py:263
+#: ../data/glade/PurchaseDetailsDialog.glade.h:15
#: ../data/glade/PurchasePaymentStep.glade.h:2
msgid "Payment Method:"
msgstr "Método de Pago:"
-#: ../stoqlib/reporting/purchase.py:264
+#: ../stoqlib/reporting/purchase.py:263
#, fuzzy
msgid "Installments:"
msgstr "Número Máximo de Plazos:"
-#: ../stoqlib/reporting/purchase.py:265
+#: ../stoqlib/reporting/purchase.py:264
#, fuzzy
msgid "Intervals:"
msgstr "Interés:"
-#: ../stoqlib/reporting/purchase.py:265
+#: ../stoqlib/reporting/purchase.py:264
msgid "Obs:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:272
+#: ../stoqlib/reporting/purchase.py:271
#, fuzzy
msgid "Quoting Items"
msgstr "Presupuestar"
#. The supplier name here ?
-#: ../stoqlib/reporting/purchase.py:279
+#: ../stoqlib/reporting/purchase.py:278
#: ../stoqlib/gui/dialogs/productstockdetails.py:166
#, fuzzy
msgid "Responsible"
msgstr "Responsable:"
-#: ../stoqlib/reporting/sale.py:48
+#: ../stoqlib/reporting/sale.py:47
msgid "Sale Order"
msgstr "Pedido de Venta"
-#: ../stoqlib/reporting/sale.py:64
+#: ../stoqlib/reporting/sale.py:63
#, fuzzy
msgid "No client"
msgstr "cliente"
-#: ../stoqlib/reporting/sale.py:69
+#: ../stoqlib/reporting/sale.py:68
#, fuzzy
msgid "No phone number"
msgstr "Teléfono"
-#: ../stoqlib/reporting/sale.py:74 ../data/glade/SalesPersonStep.glade.h:2
+#: ../stoqlib/reporting/sale.py:73 ../data/glade/SalesPersonStep.glade.h:2
#: ../data/glade/SaleDetailsDialog.glade.h:3
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:2
#: ../data/glade/DeliveryEditor.glade.h:4
@@ -696,88 +606,55 @@
msgid "Client:"
msgstr "Cliente:"
-#: ../stoqlib/reporting/sale.py:74
+#: ../stoqlib/reporting/sale.py:73
#, fuzzy
msgid "Phone number:"
msgstr "Teléfono:"
-#: ../stoqlib/reporting/sale.py:90
+#: ../stoqlib/reporting/sale.py:89
#, fuzzy
msgid "Sub-Total"
msgstr "Subtotal:"
-#: ../stoqlib/reporting/sale.py:99
+#: ../stoqlib/reporting/sale.py:98
#, python-format
msgid "%s items"
msgstr "%s artículos"
-#: ../stoqlib/reporting/sale.py:101
+#: ../stoqlib/reporting/sale.py:100
#, python-format
msgid "%s item"
msgstr "%s artículo"
-#: ../stoqlib/reporting/sale.py:111 ../data/glade/SaleDetailsDialog.glade.h:5
+#: ../stoqlib/reporting/sale.py:110 ../data/glade/SaleDetailsDialog.glade.h:5
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:2
#: ../data/glade/SaleDiscountSlave.glade.h:3
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:3
#: ../data/glade/RenegotiationDetailsDialog.glade.h:5
-#: ../data/glade/PurchaseDetailsDialog.glade.h:6
+#: ../data/glade/PurchaseDetailsDialog.glade.h:4
msgid "Discount:"
msgstr "Descuento:"
-#: ../stoqlib/reporting/sale.py:125
-#, fuzzy
-msgid "Additional Instructions:"
-msgstr "_Instrucciones Adicionales"
-
-#: ../stoqlib/reporting/sale.py:138
-#, fuzzy
-msgid "Delivery Address:"
-msgstr "<b>Dirección de Entrega:</b>"
+#: ../stoqlib/reporting/sale.py:121 ../stoqlib/gui/wizards/salewizard.py:359
+#: ../stoqlib/gui/wizards/salequotewizard.py:128
+#: ../stoqlib/gui/slaves/receivingslave.py:125
+msgid "Additional Information"
+msgstr "Información adicional"
-#: ../stoqlib/reporting/sale.py:146
+#: ../stoqlib/reporting/sale.py:129
#, fuzzy, python-format
msgid "Sale Order on %s"
msgstr "Pedido de Venta"
-#: ../stoqlib/reporting/sale.py:152
+#: ../stoqlib/reporting/sale.py:135
msgid "Sales Report"
msgstr "Informe de Ventas"
-#: ../stoqlib/reporting/sale.py:153
+#: ../stoqlib/reporting/sale.py:136
msgid "sales"
msgstr "ventas"
-#: ../stoqlib/reporting/sale.py:172 ../stoqlib/reporting/till.py:54
-#: ../stoqlib/gui/search/fiscalsearch.py:123
-#: ../stoqlib/gui/search/commissionsearch.py:81
-#: ../stoqlib/gui/search/tillsearch.py:116
-#: ../stoqlib/gui/dialogs/tillhistory.py:63
-#: ../stoqlib/gui/dialogs/clientdetails.py:125
-#: ../stoqlib/gui/dialogs/supplierdetails.py:121
-#: ../stoqlib/gui/dialogs/productstockdetails.py:129
-#: ../data/glade/FiscalMemoryEditor.glade.h:2
-msgid "Date"
-msgstr "Fecha"
-
-#: ../stoqlib/reporting/sale.py:174 ../stoqlib/gui/editors/personeditor.py:57
-#: ../stoqlib/gui/search/salesearch.py:72
-#: ../stoqlib/gui/dialogs/productstockdetails.py:149
-msgid "Client"
-msgstr "Cliente"
-
-#: ../stoqlib/reporting/sale.py:177 ../stoqlib/gui/search/salesearch.py:75
-#: ../stoqlib/gui/search/commissionsearch.py:71
-#: ../stoqlib/gui/dialogs/clientdetails.py:127
-msgid "Salesperson"
-msgstr "Vendedor"
-
-#: ../stoqlib/reporting/sale.py:190
-#, python-format
-msgid "Total %s"
-msgstr "Total %s"
-
-#: ../stoqlib/reporting/sale.py:202 ../stoqlib/lib/parameters.py:71
+#: ../stoqlib/reporting/sale.py:158 ../stoqlib/lib/parameters.py:71
#: ../stoqlib/lib/parameters.py:102 ../stoqlib/lib/parameters.py:116
#: ../stoqlib/lib/parameters.py:122 ../stoqlib/lib/parameters.py:130
#: ../stoqlib/lib/parameters.py:154 ../stoqlib/lib/parameters.py:166
@@ -792,18 +669,18 @@
msgid "Sales"
msgstr "Ventas"
-#: ../stoqlib/reporting/sale.py:208
+#: ../stoqlib/reporting/sale.py:164
#, fuzzy, python-format
msgid "sales on branch %s"
msgstr "en la unidad <u>%s</u>"
-#: ../stoqlib/reporting/sale.py:211
+#: ../stoqlib/reporting/sale.py:167
#, fuzzy, python-format
msgid "sales from %s on branch %s"
msgstr "Ingreso para el puesto \"%s\" de la unidad \"%s\""
#. ListDialog
-#: ../stoqlib/reporting/sale.py:223 ../stoqlib/gui/search/stationsearch.py:57
+#: ../stoqlib/reporting/sale.py:179 ../stoqlib/gui/search/stationsearch.py:57
#: ../stoqlib/gui/search/personsearch.py:111
#: ../stoqlib/gui/search/personsearch.py:140
#: ../stoqlib/gui/search/personsearch.py:179
@@ -816,70 +693,61 @@
msgid "Name"
msgstr "Nombre"
-#: ../stoqlib/reporting/sale.py:228
+#: ../stoqlib/reporting/sale.py:184
#, fuzzy
msgid "Total Amount"
msgstr "Total %s"
-#: ../stoqlib/reporting/sale.py:230
+#: ../stoqlib/reporting/sale.py:186
msgid "P/A"
msgstr ""
-#: ../stoqlib/reporting/sale.py:232
+#: ../stoqlib/reporting/sale.py:188
msgid "Percentage"
msgstr ""
-#: ../stoqlib/reporting/sale.py:237
+#: ../stoqlib/reporting/sale.py:193
msgid "S/P"
msgstr ""
-#: ../stoqlib/reporting/sale.py:272
+#: ../stoqlib/reporting/sale.py:228
#, python-format
msgid "Sold value per sales %s"
msgstr ""
-#: ../stoqlib/reporting/sale.py:279
+#: ../stoqlib/reporting/sale.py:235
#, fuzzy
msgid "P/A: Payment Amount"
msgstr "Informe de Pago"
-#: ../stoqlib/reporting/sale.py:280
+#: ../stoqlib/reporting/sale.py:236
msgid "S/P: Sellables sold per sale"
msgstr ""
-#: ../stoqlib/reporting/sale.py:283
+#: ../stoqlib/reporting/sale.py:239
#, fuzzy, python-format
msgid "Total of sales: %d"
msgstr "Valor total:"
-#: ../stoqlib/reporting/purchase_receival.py:35
+#: ../stoqlib/reporting/purchase_receival.py:34
msgid "Purchase Receival Report"
msgstr "Informe de Recepción de Compras"
-#: ../stoqlib/reporting/purchase_receival.py:36
+#: ../stoqlib/reporting/purchase_receival.py:35
msgid "purchase receivals"
msgstr "recibos de compra"
-#: ../stoqlib/reporting/purchase_receival.py:46
-msgid "Received Date"
-msgstr "Fecha de recepción"
-
-#: ../stoqlib/reporting/purchase_receival.py:54
-#: ../stoqlib/gui/search/receivingsearch.py:83
-msgid "Invoice #"
-msgstr "Factura #"
-
-#: ../stoqlib/reporting/purchase_receival.py:55
+#: ../stoqlib/reporting/purchase_receival.py:47
#: ../stoqlib/gui/search/receivingsearch.py:85
msgid "Invoice Total"
msgstr "Total Factura"
-#: ../stoqlib/reporting/till.py:38
+#: ../stoqlib/reporting/till.py:37
#, fuzzy
msgid "Till History Listing"
msgstr "Historia de caja"
-#: ../stoqlib/reporting/till.py:39
+#: ../stoqlib/reporting/till.py:38
#, fuzzy
msgid "till history"
msgstr "Historia de caja"
@@ -936,7 +804,7 @@
#: ../stoqlib/lib/parameters.py:77 ../stoqlib/lib/parameters.py:83
#: ../stoqlib/lib/parameters.py:89 ../stoqlib/lib/parameters.py:220
-#: ../stoqlib/lib/invoice.py:302
+#: ../stoqlib/lib/invoice.py:304
msgid "Purchase"
msgstr "Compras"
@@ -994,7 +862,7 @@
msgstr "El servicio de entrega predeterminado en el sistema."
#: ../stoqlib/lib/parameters.py:107
-#: ../stoqlib/gui/search/sellablesearch.py:126
+#: ../stoqlib/gui/search/sellablesearch.py:128
#: ../stoqlib/gui/wizards/stocktransferwizard.py:116
msgid "Stock"
msgstr "Stock"
@@ -1326,159 +1194,159 @@
msgid "There is no defined %s parameter datain the database."
msgstr "No existe ningún dato del parámetro %s definido en la base de datos."
-#: ../stoqlib/lib/invoice.py:294 ../stoqlib/gui/search/commissionsearch.py:69
+#: ../stoqlib/lib/invoice.py:296 ../stoqlib/gui/search/commissionsearch.py:69
#, fuzzy
msgid "Sale"
msgstr "Balanzas"
-#: ../stoqlib/lib/invoice.py:339
+#: ../stoqlib/lib/invoice.py:341
msgid "Company document number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:350
+#: ../stoqlib/lib/invoice.py:352
#, fuzzy
msgid "Outgoing invoice"
msgstr "factura"
-#: ../stoqlib/lib/invoice.py:361
+#: ../stoqlib/lib/invoice.py:363
#, fuzzy
msgid "Incoming invoice"
msgstr "factura"
-#: ../stoqlib/lib/invoice.py:371
+#: ../stoqlib/lib/invoice.py:373
#, fuzzy
msgid "Client name"
msgstr "Cliente"
-#: ../stoqlib/lib/invoice.py:381
+#: ../stoqlib/lib/invoice.py:383
#, fuzzy
msgid "Client Address"
msgstr "Direcciones del Cliente"
-#: ../stoqlib/lib/invoice.py:391
+#: ../stoqlib/lib/invoice.py:393
msgid "Client's document number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:407
+#: ../stoqlib/lib/invoice.py:409
#, fuzzy
msgid "Client's district"
msgstr "Cliente"
-#: ../stoqlib/lib/invoice.py:417
+#: ../stoqlib/lib/invoice.py:419
msgid "Client's postal code"
msgstr ""
-#: ../stoqlib/lib/invoice.py:427
+#: ../stoqlib/lib/invoice.py:429
#, fuzzy
msgid "Client's city"
msgstr "Cliente"
-#: ../stoqlib/lib/invoice.py:437
+#: ../stoqlib/lib/invoice.py:439
#, fuzzy
msgid "Client Phone number"
msgstr "Teléfono"
-#: ../stoqlib/lib/invoice.py:446
+#: ../stoqlib/lib/invoice.py:448
#, fuzzy
msgid "Client Fax number"
msgstr "Búsqueda de Cliente"
-#: ../stoqlib/lib/invoice.py:455
+#: ../stoqlib/lib/invoice.py:457
#, fuzzy
msgid "Client Phone/Fax number"
msgstr "Teléfono"
-#: ../stoqlib/lib/invoice.py:467
+#: ../stoqlib/lib/invoice.py:469
msgid "Client state abbreviation"
msgstr ""
-#: ../stoqlib/lib/invoice.py:477
+#: ../stoqlib/lib/invoice.py:479
msgid "Clients state registry number or document number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:491
+#: ../stoqlib/lib/invoice.py:493
#, fuzzy
msgid "Emission date"
msgstr "Datos de admisión"
-#: ../stoqlib/lib/invoice.py:501
+#: ../stoqlib/lib/invoice.py:503
#, fuzzy
msgid "Creation date"
msgstr "Fecha de pago"
-#: ../stoqlib/lib/invoice.py:511
+#: ../stoqlib/lib/invoice.py:513
msgid "Creation time"
msgstr ""
-#: ../stoqlib/lib/invoice.py:521
+#: ../stoqlib/lib/invoice.py:523
#, fuzzy
msgid "Number of payments"
msgstr "Número de plazos:"
-#: ../stoqlib/lib/invoice.py:531
+#: ../stoqlib/lib/invoice.py:533
#, fuzzy
msgid "Payment due dates"
msgstr "Tipos de Pago"
-#: ../stoqlib/lib/invoice.py:541
+#: ../stoqlib/lib/invoice.py:544
#, fuzzy
msgid "Payment values"
msgstr "Tipo de Pago"
-#: ../stoqlib/lib/invoice.py:696
+#: ../stoqlib/lib/invoice.py:699
#, fuzzy
msgid "Product item counter"
msgstr "Producto"
-#: ../stoqlib/lib/invoice.py:708
+#: ../stoqlib/lib/invoice.py:711
msgid "Product item code / description"
msgstr ""
-#: ../stoqlib/lib/invoice.py:724
+#: ../stoqlib/lib/invoice.py:727
#, fuzzy
msgid "Product item description"
msgstr "Retención de Producto"
-#: ../stoqlib/lib/invoice.py:737
+#: ../stoqlib/lib/invoice.py:740
#, fuzzy
msgid "Product item code"
msgstr "Producto"
-#: ../stoqlib/lib/invoice.py:751
+#: ../stoqlib/lib/invoice.py:754
#, fuzzy
msgid "Product item situation"
msgstr "Retención de Producto"
-#: ../stoqlib/lib/invoice.py:764
+#: ../stoqlib/lib/invoice.py:767
#, fuzzy
msgid "Product item unit"
msgstr "Producto"
-#: ../stoqlib/lib/invoice.py:777
+#: ../stoqlib/lib/invoice.py:780
#, fuzzy
msgid "Product item quantity"
msgstr "Retención de Producto"
-#: ../stoqlib/lib/invoice.py:790
+#: ../stoqlib/lib/invoice.py:793
#, fuzzy
msgid "Product item price"
msgstr "Producto"
-#: ../stoqlib/lib/invoice.py:803
+#: ../stoqlib/lib/invoice.py:806
msgid "Product item total (price * quantity)"
msgstr ""
-#: ../stoqlib/lib/invoice.py:816
+#: ../stoqlib/lib/invoice.py:819
#, fuzzy
msgid "Product item tax"
msgstr "Producto"
-#: ../stoqlib/lib/invoice.py:834
+#: ../stoqlib/lib/invoice.py:837
#, fuzzy
msgid "Invoice Type"
msgstr "Tipo de Dispositivo"
-#: ../stoqlib/lib/invoice.py:855
+#: ../stoqlib/lib/invoice.py:858
#, fuzzy
msgid "State registry number"
msgstr "Número de Registro"
@@ -2463,23 +2331,23 @@
msgid "You need to have a State Registry set on Company %s"
msgstr ""
-#: ../stoqlib/lib/defaults.py:58 ../stoqlib/domain/product.py:111
+#: ../stoqlib/lib/defaults.py:59 ../stoqlib/domain/product.py:111
msgid "Days"
msgstr "Días"
-#: ../stoqlib/lib/defaults.py:59
+#: ../stoqlib/lib/defaults.py:60
msgid "Weeks"
msgstr "Semanas"
-#: ../stoqlib/lib/defaults.py:60
+#: ../stoqlib/lib/defaults.py:61
msgid "Months"
msgstr "Meses"
-#: ../stoqlib/lib/defaults.py:61
+#: ../stoqlib/lib/defaults.py:62
msgid "Years"
msgstr "Años"
-#: ../stoqlib/lib/defaults.py:155
+#: ../stoqlib/lib/defaults.py:156
msgid "All branches"
msgstr "Todas las Unidads"
@@ -2807,6 +2675,13 @@
msgid "Layout"
msgstr "Mayotte"
+#: ../stoqlib/gui/editors/personeditor.py:57
+#: ../stoqlib/gui/search/salesearch.py:72
+#: ../stoqlib/gui/search/salesearch.py:129
+#: ../stoqlib/gui/dialogs/productstockdetails.py:149
+msgid "Client"
+msgstr "Cliente"
+
#: ../stoqlib/gui/editors/personeditor.py:58
msgid "New Client"
msgstr "Nuevo cliente"
@@ -2864,6 +2739,18 @@
msgid "Role Name:"
msgstr "Nombre del Cargo:"
+#: ../stoqlib/gui/editors/personeditor.py:249
+#: ../stoqlib/gui/editors/producteditor.py:370
+#: ../stoqlib/gui/editors/producteditor.py:390
+#: ../stoqlib/gui/search/receivingsearch.py:81
+#: ../stoqlib/gui/wizards/receivingwizard.py:103
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:184
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:354
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:470
+#: ../stoqlib/gui/dialogs/productstockdetails.py:133
+msgid "Supplier"
+msgstr "Suministrador"
+
#: ../stoqlib/gui/editors/personeditor.py:250
msgid "New Supplier"
msgstr "Nuevo suministrador"
@@ -2876,6 +2763,11 @@
msgid "New Transporter"
msgstr "Nuevo Transportista"
+#: ../stoqlib/gui/editors/personeditor.py:297
+#: ../stoqlib/gui/search/stationsearch.py:63 ../stoqlib/gui/base/search.py:353
+msgid "Branch"
+msgstr "Unidad"
+
#: ../stoqlib/gui/editors/personeditor.py:298
msgid "New Branch"
msgstr "Nueva Unidad"
@@ -2891,10 +2783,10 @@
#: ../stoqlib/gui/editors/categoryeditor.py:94
#: ../stoqlib/gui/editors/producteditor.py:126
-#: ../stoqlib/gui/search/productsearch.py:152
-#: ../stoqlib/gui/search/productsearch.py:273
+#: ../stoqlib/gui/search/productsearch.py:154
+#: ../stoqlib/gui/search/productsearch.py:275
#: ../stoqlib/gui/wizards/salequotewizard.py:171
-#: ../stoqlib/gui/wizards/purchasewizard.py:237
+#: ../stoqlib/gui/wizards/purchasewizard.py:243
#: ../stoqlib/gui/dialogs/paymentcategorydialog.py:50
msgid "Category"
msgstr "Categoría"
@@ -2938,42 +2830,71 @@
msgid "This unit type requires weighing"
msgstr "Este tipo de unidad precisa pesada"
-#: ../stoqlib/gui/editors/sellableeditor.py:324
+#: ../stoqlib/gui/editors/sellableeditor.py:241
+msgid "Do you really want to delete?"
+msgstr ""
+
+#: ../stoqlib/gui/editors/sellableeditor.py:242
+#: ../stoqlib/gui/editors/parameterseditor.py:108
+#: ../stoqlib/gui/search/parametersearch.py:92
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
+#: ../stoqlib/gui/wizards/personwizard.py:97
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:392
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:498
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:537
+#: ../stoqlib/gui/dialogs/productstockdetails.py:183
+#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
+msgid "Yes"
+msgstr "Sí"
+
+#: ../stoqlib/gui/editors/sellableeditor.py:242
+#: ../stoqlib/gui/editors/parameterseditor.py:114
+#: ../stoqlib/gui/search/parametersearch.py:92
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:392
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:498
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:537
+#: ../stoqlib/gui/dialogs/productstockdetails.py:183
+#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
+msgid "No"
+msgstr "No"
+
+#: ../stoqlib/gui/editors/sellableeditor.py:337
msgid "No unit"
msgstr "Sin unidad"
-#: ../stoqlib/gui/editors/sellableeditor.py:327
+#: ../stoqlib/gui/editors/sellableeditor.py:340
msgid "Specify:"
msgstr "Especifique:"
-#: ../stoqlib/gui/editors/sellableeditor.py:385
+#: ../stoqlib/gui/editors/sellableeditor.py:398
#, fuzzy
msgid "The code can not be empty."
msgstr "El precio de venta no puede ser 0"
-#: ../stoqlib/gui/editors/sellableeditor.py:387
+#: ../stoqlib/gui/editors/sellableeditor.py:400
#, fuzzy, python-format
msgid "The code %s already exists."
msgstr "¡El código de barras %s ya existe!"
-#: ../stoqlib/gui/editors/sellableeditor.py:393
+#: ../stoqlib/gui/editors/sellableeditor.py:406
msgid "Barcode must have 14 digits or less."
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:395
+#: ../stoqlib/gui/editors/sellableeditor.py:408
#, python-format
msgid "The barcode %s already exists"
msgstr "¡El código de barras %s ya existe!"
-#: ../stoqlib/gui/editors/sellableeditor.py:399
+#: ../stoqlib/gui/editors/sellableeditor.py:412
msgid "Price cannot be zero or negative"
msgstr "El precio no puede ser cero o negativo."
-#: ../stoqlib/gui/editors/sellableeditor.py:403
+#: ../stoqlib/gui/editors/sellableeditor.py:416
msgid "Cost cannot be zero or negative"
msgstr "El coste no puede ser cero o negativo."
-#: ../stoqlib/gui/editors/sellableeditor.py:408
+#: ../stoqlib/gui/editors/sellableeditor.py:421
msgid "Unit must have a description"
msgstr ""
@@ -2989,7 +2910,7 @@
msgstr "Servicio"
#: ../stoqlib/gui/editors/serviceeditor.py:78
-#: ../stoqlib/gui/wizards/purchasewizard.py:495
+#: ../stoqlib/gui/wizards/purchasewizard.py:505
msgid "Expected receival date must be set to a future date"
msgstr "La fecha prevista para la recepción debe situarse en el futuro"
@@ -3004,29 +2925,6 @@
msgid "Cat 52 directory selection"
msgstr "Instrucciones de la Entrega"
-#: ../stoqlib/gui/editors/parameterseditor.py:108
-#: ../stoqlib/gui/search/parametersearch.py:92
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
-#: ../stoqlib/gui/wizards/personwizard.py:97
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:390
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:495
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:534
-#: ../stoqlib/gui/dialogs/productstockdetails.py:183
-#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
-msgid "Yes"
-msgstr "Sí"
-
-#: ../stoqlib/gui/editors/parameterseditor.py:114
-#: ../stoqlib/gui/search/parametersearch.py:92
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:390
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:495
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:534
-#: ../stoqlib/gui/dialogs/productstockdetails.py:183
-#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
-msgid "No"
-msgstr "No"
-
#: ../stoqlib/gui/editors/parameterseditor.py:128
#, python-format
msgid "Edit '%s' Parameter"
@@ -3176,9 +3074,8 @@
msgstr "El descuento no puede ser mayor que el valor."
#: ../stoqlib/gui/editors/producteditor.py:458
-#: ../stoqlib/gui/editors/producteditor.py:508
-#: ../stoqlib/gui/editors/producteditor.py:518
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:247
+#: ../stoqlib/gui/editors/producteditor.py:509
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:248
#: ../data/glade/SellableTypeStep.glade.h:2
#: ../data/glade/SellableEditor.glade.h:10
msgid "Product"
@@ -3259,7 +3156,7 @@
#: ../stoqlib/gui/dialogs/devices.py:54 ../stoqlib/domain/station.py:102
#: ../stoqlib/domain/devices.py:155 ../stoqlib/domain/person.py:373
#: ../stoqlib/domain/person.py:590 ../stoqlib/domain/person.py:668
-#: ../stoqlib/domain/person.py:700 ../stoqlib/domain/person.py:1059
+#: ../stoqlib/domain/person.py:700 ../stoqlib/domain/person.py:1060
#: ../stoqlib/domain/test/test_person.py:510
#: ../stoqlib/domain/test/test_person.py:519
#: ../stoqlib/domain/payment/method.py:147
@@ -3271,26 +3168,26 @@
msgid "Active"
msgstr "Activo"
-#: ../stoqlib/gui/search/servicesearch.py:48
+#: ../stoqlib/gui/search/servicesearch.py:49
msgid "Service Search"
msgstr "Búsqueda de Servicio"
-#: ../stoqlib/gui/search/servicesearch.py:54
+#: ../stoqlib/gui/search/servicesearch.py:55
msgid "Add services"
msgstr "Añadir servicios"
-#: ../stoqlib/gui/search/servicesearch.py:55
+#: ../stoqlib/gui/search/servicesearch.py:56
msgid "service"
msgstr "servicio"
-#: ../stoqlib/gui/search/servicesearch.py:67
+#: ../stoqlib/gui/search/servicesearch.py:68
#: ../stoqlib/gui/search/personsearch.py:311
-#: ../stoqlib/gui/search/productsearch.py:89
+#: ../stoqlib/gui/search/productsearch.py:90
msgid "matching"
msgstr "incluyendo"
-#: ../stoqlib/gui/search/servicesearch.py:73
-#: ../stoqlib/gui/search/productsearch.py:97
+#: ../stoqlib/gui/search/servicesearch.py:74
+#: ../stoqlib/gui/search/productsearch.py:98
#, fuzzy
msgid "_Table of Price"
msgstr "Precio de Promoción"
@@ -3298,26 +3195,26 @@
#. if not items:
#. raise ValueError('You should have at least one branch at '
#. 'this point')
-#: ../stoqlib/gui/search/servicesearch.py:90
+#: ../stoqlib/gui/search/servicesearch.py:91
#: ../stoqlib/gui/search/personsearch.py:91
#: ../stoqlib/gui/search/personsearch.py:97
#: ../stoqlib/gui/search/personsearch.py:223
#: ../stoqlib/gui/search/personsearch.py:262
#: ../stoqlib/gui/search/personsearch.py:322
-#: ../stoqlib/gui/search/productsearch.py:134
+#: ../stoqlib/gui/search/productsearch.py:135
#: ../stoqlib/gui/search/salesearch.py:62
#: ../stoqlib/gui/search/tillsearch.py:105
-#: ../stoqlib/gui/search/paymentsearch.py:55 ../stoqlib/gui/base/search.py:300
+#: ../stoqlib/gui/search/paymentsearch.py:55 ../stoqlib/gui/base/search.py:350
msgid "Any"
msgstr "Cualquiera"
-#: ../stoqlib/gui/search/servicesearch.py:91
+#: ../stoqlib/gui/search/servicesearch.py:92
msgid "Show services with status"
msgstr "Mostrar servicios en estado"
-#: ../stoqlib/gui/search/servicesearch.py:108
-#: ../stoqlib/gui/search/productsearch.py:150
-#: ../stoqlib/gui/search/sellablesearch.py:120
+#: ../stoqlib/gui/search/servicesearch.py:109
+#: ../stoqlib/gui/search/productsearch.py:152
+#: ../stoqlib/gui/search/sellablesearch.py:122
msgid "Barcode"
msgstr "Código de Barras"
@@ -3364,6 +3261,22 @@
msgid "Registry Number"
msgstr "Número de Registro"
+#: ../stoqlib/gui/search/personsearch.py:116
+#: ../stoqlib/gui/search/personsearch.py:336
+#: ../stoqlib/gui/search/paymentsearch.py:82
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:133
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:92
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:131
+#: ../stoqlib/gui/dialogs/saledetails.py:152
+#: ../stoqlib/gui/dialogs/clientdetails.py:129
+#: ../stoqlib/gui/dialogs/clientdetails.py:164
+#: ../stoqlib/gui/dialogs/supplierdetails.py:123
+#: ../stoqlib/gui/dialogs/supplierdetails.py:149
+#: ../stoqlib/gui/dialogs/purchasedetails.py:177
+#: ../stoqlib/domain/payment/views.py:262
+msgid "Status"
+msgstr "Situación"
+
#: ../stoqlib/gui/search/personsearch.py:125
msgid "Supplier Search"
msgstr "Búsqueda de suministrador"
@@ -3456,7 +3369,7 @@
#: ../stoqlib/domain/devices.py:156 ../stoqlib/domain/person.py:374
#: ../stoqlib/domain/person.py:499 ../stoqlib/domain/person.py:591
#: ../stoqlib/domain/person.py:669 ../stoqlib/domain/person.py:701
-#: ../stoqlib/domain/person.py:1061 ../stoqlib/domain/test/test_person.py:462
+#: ../stoqlib/domain/person.py:1062 ../stoqlib/domain/test/test_person.py:462
#: ../stoqlib/domain/test/test_person.py:473
#: ../stoqlib/domain/payment/method.py:148 ../plugins/ecf/ecfdomain.py:205
#: ../data/glade/BranchDetailsSlave.glade.h:3
@@ -3566,15 +3479,30 @@
msgid "ISS Total:"
msgstr "IVA (2) Total:"
+#: ../stoqlib/gui/search/fiscalsearch.py:123
+#: ../stoqlib/gui/search/commissionsearch.py:81
+#: ../stoqlib/gui/search/tillsearch.py:116
+#: ../stoqlib/gui/dialogs/tillhistory.py:63
+#: ../stoqlib/gui/dialogs/clientdetails.py:125
+#: ../stoqlib/gui/dialogs/supplierdetails.py:121
+#: ../stoqlib/gui/dialogs/productstockdetails.py:129
+#: ../data/glade/FiscalMemoryEditor.glade.h:2
+msgid "Date"
+msgstr "Fecha"
+
#: ../stoqlib/gui/search/fiscalsearch.py:125
#: ../stoqlib/gui/dialogs/productstockdetails.py:135
msgid "Invoice"
msgstr "Factura"
+#: ../stoqlib/gui/search/fiscalsearch.py:128
+msgid "Drawee"
+msgstr "Retirado"
+
#. Branch
#: ../stoqlib/gui/search/fiscalsearch.py:151
-#: ../stoqlib/gui/search/productsearch.py:127
-#: ../stoqlib/gui/search/productsearch.py:216
+#: ../stoqlib/gui/search/productsearch.py:128
+#: ../stoqlib/gui/search/productsearch.py:218
#: ../stoqlib/gui/search/purchasesearch.py:63
msgid "In branch:"
msgstr "En la unidad"
@@ -3661,8 +3589,8 @@
#. Date
#: ../stoqlib/gui/search/transfersearch.py:85
-#: ../stoqlib/gui/search/productsearch.py:211
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:341
+#: ../stoqlib/gui/search/productsearch.py:213
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:343
#: ../stoqlib/gui/dialogs/tillhistory.py:75
#: ../data/glade/EmployeeDetailsSlave.glade.h:7
#: ../data/glade/ProductsAdjustment.glade.h:3
@@ -3672,7 +3600,7 @@
msgstr "Fecha:"
#: ../stoqlib/gui/search/transfersearch.py:90
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:354
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:356
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:144
#, fuzzy
msgid "Open Date"
@@ -3693,40 +3621,40 @@
msgid "Number of items transferred"
msgstr "Número de artículos para bloquear: "
-#: ../stoqlib/gui/search/productsearch.py:57
+#: ../stoqlib/gui/search/productsearch.py:58
msgid "Product Search"
msgstr "Búsqueda de productos"
-#: ../stoqlib/gui/search/productsearch.py:62
+#: ../stoqlib/gui/search/productsearch.py:63
msgid "Add products"
msgstr "Añadir productos"
-#: ../stoqlib/gui/search/productsearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:249
+#: ../stoqlib/gui/search/productsearch.py:64
+#: ../stoqlib/gui/search/productsearch.py:251
msgid "product"
msgstr "producto"
-#: ../stoqlib/gui/search/productsearch.py:135
+#: ../stoqlib/gui/search/productsearch.py:136
msgid "with status:"
msgstr "con estado:"
-#: ../stoqlib/gui/search/productsearch.py:156
-#: ../stoqlib/gui/search/productsearch.py:277
+#: ../stoqlib/gui/search/productsearch.py:158
+#: ../stoqlib/gui/search/productsearch.py:279
#, fuzzy
msgid "Location"
msgstr "De vacaciones"
-#: ../stoqlib/gui/search/productsearch.py:194
+#: ../stoqlib/gui/search/productsearch.py:196
#, fuzzy
msgid "Product History Search"
msgstr "Búsqueda de productos"
-#: ../stoqlib/gui/search/productsearch.py:244
+#: ../stoqlib/gui/search/productsearch.py:246
#, fuzzy
msgid "Product Stock Search"
msgstr "Búsqueda de productos"
-#: ../stoqlib/gui/search/productsearch.py:288
+#: ../stoqlib/gui/search/productsearch.py:290
msgid "Difference"
msgstr ""
@@ -3738,18 +3666,57 @@
msgid "Show sales with status"
msgstr "Mostrar ventas con estado"
+#: ../stoqlib/gui/search/salesearch.py:68
+#: ../stoqlib/gui/search/paymentsearch.py:76
+#: ../stoqlib/gui/wizards/receivingwizard.py:97
+#: ../stoqlib/gui/dialogs/tillhistory.py:61
+msgid "Number"
+msgstr "Número"
+
#: ../stoqlib/gui/search/salesearch.py:70
-#: ../stoqlib/gui/wizards/receivingwizard.py:98
+#: ../stoqlib/gui/wizards/receivingwizard.py:99
#: ../stoqlib/gui/dialogs/productstockdetails.py:146
msgid "Date Started"
msgstr "Fecha de apertura"
+#: ../stoqlib/gui/search/salesearch.py:75
+#: ../stoqlib/gui/search/commissionsearch.py:71
+#: ../stoqlib/gui/dialogs/clientdetails.py:127
+msgid "Salesperson"
+msgstr "Vendedor"
+
#: ../stoqlib/gui/search/salesearch.py:77
-#: ../data/glade/SaleDetailsDialog.glade.h:6
+#: ../data/glade/SaleDetailsDialog.glade.h:7
#: ../data/glade/RenegotiationDetailsDialog.glade.h:6
msgid "Items"
msgstr "Artículos"
+#: ../stoqlib/gui/search/salesearch.py:115
+#, fuzzy
+msgid "Delivery Search"
+msgstr "Servicio de entrega"
+
+#: ../stoqlib/gui/search/salesearch.py:122
+#, fuzzy
+msgid "Items matching:"
+msgstr "Mostrar artículos en venta en"
+
+#: ../stoqlib/gui/search/salesearch.py:125
+#: ../stoqlib/gui/search/purchasesearch.py:76
+#, fuzzy
+msgid "# "
+msgstr "#"
+
+#: ../stoqlib/gui/search/salesearch.py:132
+#, fuzzy
+msgid "Estimated Date"
+msgstr "Fecha de Resolución"
+
+#: ../stoqlib/gui/search/salesearch.py:134
+#, fuzzy
+msgid "Completion Date"
+msgstr "Fecha de pago"
+
#: ../stoqlib/gui/search/commissionsearch.py:46
#, fuzzy
msgid "Search for Commissions"
@@ -3806,16 +3773,15 @@
msgid "Receival Date"
msgstr "Fecha de llegada"
+#: ../stoqlib/gui/search/receivingsearch.py:83
+msgid "Invoice #"
+msgstr "Factura #"
+
#: ../stoqlib/gui/search/purchasesearch.py:43
#, fuzzy
msgid "Purchased Items Search"
msgstr "Búsqueda de Pedidos de Compra"
-#: ../stoqlib/gui/search/purchasesearch.py:76
-#, fuzzy
-msgid "# "
-msgstr "#"
-
#: ../stoqlib/gui/search/purchasesearch.py:80
#, fuzzy
msgid "Purchased"
@@ -3831,23 +3797,23 @@
msgid "Expected receival"
msgstr "Fecha esperada para recepción:"
-#: ../stoqlib/gui/search/sellablesearch.py:50
+#: ../stoqlib/gui/search/sellablesearch.py:51
msgid "Search for sale items"
msgstr "Búsqueda de artículos en venta"
-#: ../stoqlib/gui/search/sellablesearch.py:55
+#: ../stoqlib/gui/search/sellablesearch.py:56
msgid "_Add sale items"
msgstr "Añadir artículo en venta"
-#: ../stoqlib/gui/search/sellablesearch.py:56
+#: ../stoqlib/gui/search/sellablesearch.py:57
msgid "sale item"
msgstr "artículo"
-#: ../stoqlib/gui/search/sellablesearch.py:56
+#: ../stoqlib/gui/search/sellablesearch.py:57
msgid "sale items"
msgstr "artículos"
-#: ../stoqlib/gui/search/sellablesearch.py:84
+#: ../stoqlib/gui/search/sellablesearch.py:85
#, fuzzy
msgid "Show items matching:"
msgstr "Mostrar artículos en venta en"
@@ -3873,7 +3839,7 @@
msgstr "Parámetros de Sistema de Stoq"
#: ../stoqlib/gui/search/parametersearch.py:68
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:350
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:352
msgid "Group"
msgstr "Grupo"
@@ -3894,19 +3860,29 @@
msgid "Bill or check number:"
msgstr "Número de la Agencia:"
+#: ../stoqlib/gui/search/paymentsearch.py:70
+#, fuzzy
+msgid "Bank"
+msgstr "Banco:"
+
#: ../stoqlib/gui/search/paymentsearch.py:72
#, fuzzy
msgid "Branch Number"
msgstr "Número de la Agencia:"
+#: ../stoqlib/gui/search/paymentsearch.py:74
+#, fuzzy
+msgid "Account"
+msgstr "Cuenta:"
+
#: ../stoqlib/gui/search/paymentsearch.py:78
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:128
#: ../stoqlib/gui/wizards/renegotiationwizard.py:90
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:126
-#: ../stoqlib/gui/dialogs/saledetails.py:154
+#: ../stoqlib/gui/dialogs/saledetails.py:147
#: ../stoqlib/gui/dialogs/clientdetails.py:162
#: ../stoqlib/gui/dialogs/supplierdetails.py:147
-#: ../stoqlib/gui/dialogs/purchasedetails.py:189
+#: ../stoqlib/gui/dialogs/purchasedetails.py:172
#: ../stoqlib/gui/slaves/paymentslave.py:1038
#: ../stoqlib/domain/payment/views.py:260
msgid "Due Date"
@@ -3915,8 +3891,8 @@
#: ../stoqlib/gui/search/paymentsearch.py:80
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:131
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:129
-#: ../stoqlib/gui/dialogs/saledetails.py:157
-#: ../stoqlib/gui/dialogs/purchasedetails.py:192
+#: ../stoqlib/gui/dialogs/saledetails.py:150
+#: ../stoqlib/gui/dialogs/purchasedetails.py:175
msgid "Paid Date"
msgstr "Fecha del pago"
@@ -3937,8 +3913,8 @@
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:138
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:136
-#: ../stoqlib/gui/dialogs/saledetails.py:164
-#: ../stoqlib/gui/dialogs/purchasedetails.py:200
+#: ../stoqlib/gui/dialogs/saledetails.py:157
+#: ../stoqlib/gui/dialogs/purchasedetails.py:183
msgid "Paid Value"
msgstr "Valor del Pago"
@@ -3971,12 +3947,6 @@
msgid "Client %s does not have enought credit left."
msgstr ""
-#: ../stoqlib/gui/wizards/salewizard.py:359
-#: ../stoqlib/gui/wizards/salequotewizard.py:128
-#: ../stoqlib/gui/slaves/receivingslave.py:119
-msgid "Additional Information"
-msgstr "Información adicional"
-
#: ../stoqlib/gui/wizards/salewizard.py:371
msgid "Sale Checkout"
msgstr "Confirmación de Venta"
@@ -4017,7 +3987,7 @@
msgstr "La fecha prevista de recepción debe ser la actual o una futura"
#: ../stoqlib/gui/wizards/salequotewizard.py:135
-#: ../stoqlib/gui/wizards/purchasewizard.py:175
+#: ../stoqlib/gui/wizards/purchasewizard.py:181
msgid "Total Ordered:"
msgstr "Valor solicitado:"
@@ -4040,47 +4010,52 @@
msgid "Expected receival date must be set to today or a future date"
msgstr "La fecha prevista de recepción debe ser la actual o una futura"
-#: ../stoqlib/gui/wizards/purchasewizard.py:241
-#: ../stoqlib/gui/wizards/receivingwizard.py:101
+#: ../stoqlib/gui/wizards/purchasewizard.py:173
+#, fuzzy
+msgid "The expected freight value must be a positive number."
+msgstr "El número debe ser positivo y mayor que 0"
+
+#: ../stoqlib/gui/wizards/purchasewizard.py:247
+#: ../stoqlib/gui/wizards/receivingwizard.py:102
#, fuzzy
msgid "Expected Receival"
msgstr "Fecha esperada para recepción:"
-#: ../stoqlib/gui/wizards/purchasewizard.py:303
+#: ../stoqlib/gui/wizards/purchasewizard.py:309
#, fuzzy
msgid "The cost must be greater than zero."
msgstr "El descuento no puede ser mayor que el valor."
-#: ../stoqlib/gui/wizards/purchasewizard.py:307
+#: ../stoqlib/gui/wizards/purchasewizard.py:313
#, fuzzy
msgid "Quantity must be greater than zero"
msgstr "El descuento no puede ser mayor que el valor."
-#: ../stoqlib/gui/wizards/purchasewizard.py:311
+#: ../stoqlib/gui/wizards/purchasewizard.py:317
msgid "Quantity below the minimum required by the supplier"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:332
+#: ../stoqlib/gui/wizards/purchasewizard.py:338
#: ../stoqlib/domain/payment/operation.py:115
msgid "Bill"
msgstr "Pagaré"
-#: ../stoqlib/gui/wizards/purchasewizard.py:333
+#: ../stoqlib/gui/wizards/purchasewizard.py:339
#: ../stoqlib/domain/payment/operation.py:73
msgid "Check"
msgstr "Cheque"
-#: ../stoqlib/gui/wizards/purchasewizard.py:334
+#: ../stoqlib/gui/wizards/purchasewizard.py:340
#: ../stoqlib/domain/payment/operation.py:50
#: ../data/glade/BasePaymentAddition.glade.h:4
msgid "Money"
msgstr "Dinero"
-#: ../stoqlib/gui/wizards/purchasewizard.py:541
+#: ../stoqlib/gui/wizards/purchasewizard.py:551
msgid "New Order"
msgstr "Nuevo Pedido"
-#: ../stoqlib/gui/wizards/purchasewizard.py:542
+#: ../stoqlib/gui/wizards/purchasewizard.py:552
msgid "Edit Order"
msgstr "Editar el Pedido"
@@ -4108,93 +4083,93 @@
msgid "Adding a %s"
msgstr "Añadiendo %s"
-#: ../stoqlib/gui/wizards/receivingwizard.py:105
+#: ../stoqlib/gui/wizards/receivingwizard.py:106
msgid "Qty Ordered"
msgstr "Cantidad solicitada"
-#: ../stoqlib/gui/wizards/receivingwizard.py:111
+#: ../stoqlib/gui/wizards/receivingwizard.py:112
msgid "Order Total"
msgstr "Total de la Orden"
-#: ../stoqlib/gui/wizards/receivingwizard.py:203
+#: ../stoqlib/gui/wizards/receivingwizard.py:205
#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:4
msgid "Total Received:"
msgstr "Total Recibido:"
-#: ../stoqlib/gui/wizards/receivingwizard.py:247
+#: ../stoqlib/gui/wizards/receivingwizard.py:249
msgid "Quantity to receive"
msgstr "Cantidad pedida"
-#: ../stoqlib/gui/wizards/receivingwizard.py:291
+#: ../stoqlib/gui/wizards/receivingwizard.py:299
msgid "Receiving Order"
msgstr "Pedidos de Compra"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:110
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:111
#, fuzzy
msgid "The quote deadline date must be set to today or a future date"
msgstr "La fecha prevista de recepción debe ser la actual o una futura"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:177
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:178
msgid ""
"No supplier have been found for any of the selected items.\n"
"This quote will be cancelled."
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:185
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:186
#, fuzzy
msgid "Supplied/Total"
msgstr "Por Venta Total"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:215
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:216
#, fuzzy, python-format
msgid "%s/%s"
msgstr "%s %s"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:253
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:254
#, fuzzy, python-format
msgid "Products supplied by %s"
msgstr "Suministradores de productos"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:267
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:268
#, fuzzy
msgid "Missing Products"
msgstr "Productos"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:348
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:350
#, fuzzy
msgid "Quote"
msgstr "Cantidad"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:356
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:358
#, fuzzy
msgid "Deadline"
msgstr "Entrega"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:389
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:391
#, python-format
msgid "Are you sure you want to remove \"%s\" ?"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:493
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:496
msgid ""
"Are you sure you want to cancel this group ? If so, note that all the quotes "
"will be cancelled."
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:532
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:535
msgid "Should we close the quotes used to compose the purchase order ?"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:612
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:615
msgid "New Quote"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:613
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:616
#, fuzzy
msgid "Edit Quote"
msgstr "Editar el Pedido"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:652
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:655
#, fuzzy
msgid "Receive Quote Wizard"
msgstr "Fecha de recepción"
@@ -4254,8 +4229,8 @@
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:52
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:212
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:151
-#: ../stoqlib/gui/dialogs/saledetails.py:183
-#: ../stoqlib/gui/dialogs/purchasedetails.py:209
+#: ../stoqlib/gui/dialogs/saledetails.py:176
+#: ../stoqlib/gui/dialogs/purchasedetails.py:192
#: ../stoqlib/gui/slaves/paymentslave.py:903 ../plugins/ecf/ecfdomain.py:250
msgid "Payment"
msgstr "Pago"
@@ -4278,39 +4253,39 @@
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:210
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:149
-#: ../stoqlib/gui/dialogs/saledetails.py:181
-#: ../stoqlib/gui/dialogs/purchasedetails.py:207
+#: ../stoqlib/gui/dialogs/saledetails.py:174
+#: ../stoqlib/gui/dialogs/purchasedetails.py:190
#: ../stoqlib/gui/dialogs/productstockdetails.py:174
msgid "When"
msgstr ""
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:215
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:154
-#: ../stoqlib/gui/dialogs/saledetails.py:186
-#: ../stoqlib/gui/dialogs/purchasedetails.py:212
+#: ../stoqlib/gui/dialogs/saledetails.py:179
+#: ../stoqlib/gui/dialogs/purchasedetails.py:195
#, fuzzy
msgid "Changed"
msgstr "Chad"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:217
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:156
-#: ../stoqlib/gui/dialogs/saledetails.py:188
-#: ../stoqlib/gui/dialogs/purchasedetails.py:214
+#: ../stoqlib/gui/dialogs/saledetails.py:181
+#: ../stoqlib/gui/dialogs/purchasedetails.py:197
#, fuzzy
msgid "From"
msgstr "De:"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:219
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:158
-#: ../stoqlib/gui/dialogs/saledetails.py:190
-#: ../stoqlib/gui/dialogs/purchasedetails.py:216
+#: ../stoqlib/gui/dialogs/saledetails.py:183
+#: ../stoqlib/gui/dialogs/purchasedetails.py:199
msgid "To"
msgstr "Hasta"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:221
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:160
-#: ../stoqlib/gui/dialogs/saledetails.py:192
-#: ../stoqlib/gui/dialogs/purchasedetails.py:218
+#: ../stoqlib/gui/dialogs/saledetails.py:185
+#: ../stoqlib/gui/dialogs/purchasedetails.py:201
#: ../stoqlib/gui/dialogs/productstockdetails.py:176
#, fuzzy
msgid "Reason"
@@ -4326,15 +4301,15 @@
msgid "Payment Details"
msgstr "Configuración de formas de pago"
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:42
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:44
msgid "CSV Exporter Dialog"
msgstr ""
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:90
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:92
msgid "Export CSV..."
msgstr ""
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:97
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:99
msgid "CSV Files"
msgstr ""
@@ -4534,7 +4509,7 @@
msgstr "Detalles de pedidos"
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:122
-#: ../stoqlib/gui/dialogs/saledetails.py:150
+#: ../stoqlib/gui/dialogs/saledetails.py:143
#: ../stoqlib/gui/dialogs/clientdetails.py:157
#: ../stoqlib/gui/dialogs/supplierdetails.py:142
msgid "Type"
@@ -4573,7 +4548,7 @@
msgid "Sale Details"
msgstr "Detalles de la Venta"
-#: ../stoqlib/gui/dialogs/saledetails.py:232
+#: ../stoqlib/gui/dialogs/saledetails.py:227
msgid "Sale Cancellation Details"
msgstr "Detalles de la cancelación de la venta"
@@ -4637,7 +4612,7 @@
msgid "Purchase Details"
msgstr "Detalles del pedido"
-#: ../stoqlib/gui/dialogs/purchasedetails.py:174
+#: ../stoqlib/gui/dialogs/purchasedetails.py:157
msgid "Quantity Received"
msgstr "Cantidad Recibida"
@@ -4668,32 +4643,32 @@
msgid "Notification"
msgstr "Notificación"
-#: ../stoqlib/gui/base/search.py:157
+#: ../stoqlib/gui/base/search.py:204
msgid "Se_lect Items"
msgstr "S_eleccione artículos"
-#: ../stoqlib/gui/base/search.py:607
+#: ../stoqlib/gui/base/search.py:657
msgid "This week"
msgstr ""
-#: ../stoqlib/gui/base/search.py:619
+#: ../stoqlib/gui/base/search.py:669
msgid "Last Week"
msgstr ""
-#: ../stoqlib/gui/base/search.py:631
+#: ../stoqlib/gui/base/search.py:681
msgid "Next week"
msgstr ""
-#: ../stoqlib/gui/base/search.py:642
+#: ../stoqlib/gui/base/search.py:692
msgid "This month"
msgstr ""
-#: ../stoqlib/gui/base/search.py:652
+#: ../stoqlib/gui/base/search.py:702
#, fuzzy
msgid "Last month"
msgstr "Coste base"
-#: ../stoqlib/gui/base/search.py:662
+#: ../stoqlib/gui/base/search.py:712
msgid "Next month"
msgstr ""
@@ -4740,20 +4715,20 @@
msgid "Sale price can not be 0"
msgstr "El precio de venta no puede ser 0"
-#: ../stoqlib/gui/slaves/productslave.py:85
+#: ../stoqlib/gui/slaves/productslave.py:82
msgid "Minimum value must be a positive value."
msgstr ""
-#: ../stoqlib/gui/slaves/productslave.py:89
+#: ../stoqlib/gui/slaves/productslave.py:86
#, fuzzy
msgid "Minimum must be lower than the maximum value."
msgstr "La fecha prevista para la recepción debe situarse en el futuro"
-#: ../stoqlib/gui/slaves/productslave.py:96
+#: ../stoqlib/gui/slaves/productslave.py:93
msgid "Maximum value must be a positive value."
msgstr ""
-#: ../stoqlib/gui/slaves/productslave.py:100
+#: ../stoqlib/gui/slaves/productslave.py:97
#, fuzzy
msgid "Maximum must be greater than the minimum value."
msgstr "La fecha prevista para la recepción debe situarse en el futuro"
@@ -4775,66 +4750,70 @@
msgid "Select Image"
msgstr "Seleccione Imagen"
-#: ../stoqlib/gui/slaves/receivingslave.py:123
+#: ../stoqlib/gui/slaves/receivingslave.py:129
msgid "Receving order number must be between 1 and 999999"
msgstr "El número de la factura debe estar entre 1 y 999999"
-#: ../stoqlib/gui/slaves/receivingslave.py:131
+#: ../stoqlib/gui/slaves/receivingslave.py:137
#, fuzzy, python-format
msgid "Invoice %d already exists for supplier %s."
msgstr "Ya existe una %s para el puesto %s"
-#: ../stoqlib/gui/slaves/receivingslave.py:136
+#: ../stoqlib/gui/slaves/receivingslave.py:142
msgid "This field cannot be negative"
msgstr "Este campo no puede ser negactivo."
-#: ../stoqlib/gui/slaves/receivingslave.py:176
+#: ../stoqlib/gui/slaves/receivingslave.py:182
#, fuzzy
msgid "Discount must be greater than zero"
msgstr "El descuento no puede ser mayor que el valor."
-#: ../stoqlib/gui/slaves/receivingslave.py:178
+#: ../stoqlib/gui/slaves/receivingslave.py:184
#, fuzzy, python-format
msgid "Discount must be less than %s"
msgstr "La fecha final debe ser anterior al día de hoy"
-#: ../stoqlib/gui/slaves/installmentslave.py:188
+#: ../stoqlib/gui/slaves/installmentslave.py:204
msgid "Confirm payment"
msgstr "Confirmar pago"
-#: ../stoqlib/gui/slaves/installmentslave.py:229
+#: ../stoqlib/gui/slaves/installmentslave.py:245
msgid "Due"
msgstr "Vencimiento"
-#: ../stoqlib/gui/slaves/installmentslave.py:232
+#: ../stoqlib/gui/slaves/installmentslave.py:246
+msgid "Paid date"
+msgstr "Fecha de pago"
+
+#: ../stoqlib/gui/slaves/installmentslave.py:248
msgid "Paid value"
msgstr "Valor Pagado"
-#: ../stoqlib/gui/slaves/installmentslave.py:287
+#: ../stoqlib/gui/slaves/installmentslave.py:309
#, python-format
msgid "Paid date must be between %s and today"
msgstr "La fecha de pago debe estar entre %s y hoy"
-#: ../stoqlib/gui/slaves/installmentslave.py:297
+#: ../stoqlib/gui/slaves/installmentslave.py:319
msgid "Penalty can not be less than zero"
msgstr "La penalización no puede ser menor que cero"
-#: ../stoqlib/gui/slaves/installmentslave.py:306
+#: ../stoqlib/gui/slaves/installmentslave.py:328
#, fuzzy
msgid "Interest can not be less than zero"
msgstr "La penalización no puede ser menor que cero"
-#: ../stoqlib/gui/slaves/installmentslave.py:316
+#: ../stoqlib/gui/slaves/installmentslave.py:338
#, fuzzy, python-format
msgid "Discount can not be greater or equal than %.2f"
msgstr "El descuento no puede ser mayor que el valor %d%%."
-#: ../stoqlib/gui/slaves/installmentslave.py:319
+#: ../stoqlib/gui/slaves/installmentslave.py:341
#, fuzzy
msgid "Discount can not be less than zero"
msgstr "La penalización no puede ser menor que cero"
-#: ../stoqlib/gui/slaves/installmentslave.py:368
+#: ../stoqlib/gui/slaves/installmentslave.py:390
msgid "Supplier: "
msgstr "Suministrador:"
@@ -5100,11 +5079,16 @@
msgstr "Pendiente"
#: ../stoqlib/domain/transfer.py:80 ../stoqlib/domain/purchase.py:145
-#: ../stoqlib/domain/sellable.py:251 ../stoqlib/domain/till.py:88
+#: ../stoqlib/domain/sellable.py:249 ../stoqlib/domain/till.py:88
#: ../stoqlib/domain/inventory.py:168 ../stoqlib/domain/payment/group.py:62
msgid "Closed"
msgstr "Cerrado"
+#: ../stoqlib/domain/receiving.py:214
+#, python-format
+msgid "Freight for purchase %s"
+msgstr ""
+
#: ../stoqlib/domain/devices.py:66
msgid "Serial port 1"
msgstr "Puerto serie 1"
@@ -5130,81 +5114,101 @@
msgid "Day"
msgstr "Días"
-#: ../stoqlib/domain/purchase.py:141 ../stoqlib/domain/sale.py:277
-#: ../stoqlib/domain/inventory.py:169 ../stoqlib/domain/payment/payment.py:77
+#: ../stoqlib/domain/purchase.py:141 ../stoqlib/domain/sale.py:279
+#: ../stoqlib/domain/inventory.py:169 ../stoqlib/domain/payment/payment.py:79
#: ../stoqlib/domain/payment/group.py:63
msgid "Cancelled"
msgstr "Cancelado"
-#: ../stoqlib/domain/purchase.py:142 ../stoqlib/domain/sale.py:281
+#: ../stoqlib/domain/purchase.py:142 ../stoqlib/domain/sale.py:283
msgid "Quoting"
msgstr "Presupuestar"
-#: ../stoqlib/domain/purchase.py:144 ../stoqlib/domain/sale.py:275
-#: ../stoqlib/domain/payment/payment.py:76
+#: ../stoqlib/domain/purchase.py:144 ../stoqlib/domain/sale.py:277
+#: ../stoqlib/domain/payment/payment.py:78
#: ../stoqlib/domain/payment/renegotiation.py:55
#: ../stoqlib/domain/payment/group.py:61
msgid "Confirmed"
msgstr "Confirmado"
-#: ../stoqlib/domain/purchase.py:150 ../data/glade/StartPurchaseStep.glade.h:7
+#: ../stoqlib/domain/purchase.py:150 ../data/glade/StartPurchaseStep.glade.h:6
msgid "FOB"
msgstr "Transporte no incluído"
-#: ../stoqlib/domain/purchase.py:151 ../data/glade/StartPurchaseStep.glade.h:6
+#: ../stoqlib/domain/purchase.py:151 ../data/glade/StartPurchaseStep.glade.h:4
msgid "CIF"
msgstr "Transporte incluído"
-#: ../stoqlib/domain/purchase.py:515
+#: ../stoqlib/domain/purchase.py:508
#, python-format
msgid "quote number %04d"
msgstr ""
-#: ../stoqlib/domain/purchase.py:569
+#: ../stoqlib/domain/purchase.py:562
#, fuzzy, python-format
msgid "%s Money Returned for Purchase %d"
msgstr "%s Dinero devuelto por la compra %d"
-#: ../stoqlib/domain/sale.py:274 ../stoqlib/domain/till.py:87
+#: ../stoqlib/domain/sale.py:276 ../stoqlib/domain/till.py:87
#: ../stoqlib/domain/inventory.py:167
msgid "Opened"
msgstr "Abierto"
-#: ../stoqlib/domain/sale.py:276 ../stoqlib/domain/payment/payment.py:74
+#: ../stoqlib/domain/sale.py:278 ../stoqlib/domain/payment/payment.py:76
#: ../stoqlib/domain/payment/renegotiation.py:56
msgid "Paid"
msgstr "Pagado"
-#: ../stoqlib/domain/sale.py:279
+#: ../stoqlib/domain/sale.py:281
msgid "Returned"
msgstr "Devuelto"
-#: ../stoqlib/domain/sale.py:280 ../stoqlib/domain/payment/renegotiation.py:57
+#: ../stoqlib/domain/sale.py:282 ../stoqlib/domain/payment/renegotiation.py:57
#, fuzzy
msgid "Renegotiated"
msgstr "Sin título"
+#: ../stoqlib/domain/sale.py:550
+#, fuzzy, python-format
+msgid "Sale Details: %s"
+msgstr "Detalles de la Venta"
+
+#: ../stoqlib/domain/sale.py:556
+#, fuzzy, python-format
+msgid "Delivery Address: %s"
+msgstr "<b>Dirección de Entrega:</b>"
+
+#: ../stoqlib/domain/sale.py:562
+#, fuzzy, python-format
+msgid "\"%s\" Notes: %s"
+msgstr "Egreso: %s"
+
+#: ../stoqlib/domain/sale.py:565
+#, fuzzy, python-format
+msgid "\"%s\" Estimated Fix Date: %s"
+msgstr "Fecha Estimada para Ejecución:"
+
#. The sale was not entirely paid, so we have to payback the
#. till, because the sale amount have already been added in there
-#: ../stoqlib/domain/sale.py:826
+#: ../stoqlib/domain/sale.py:845
#, python-format
msgid "Debit on Till: Sale %d Returned"
msgstr ""
-#: ../stoqlib/domain/sale.py:836
+#: ../stoqlib/domain/sale.py:855
#, python-format
msgid "%s Money Returned for Sale %d"
msgstr "%s Dinero devuelto por la compra %d"
-#: ../stoqlib/domain/sellable.py:249
+#: ../stoqlib/domain/sellable.py:247
msgid "Available"
msgstr "Disponible"
-#: ../stoqlib/domain/sellable.py:252 ../stoqlib/domain/person.py:592
+#: ../stoqlib/domain/sellable.py:250 ../stoqlib/domain/person.py:592
msgid "Blocked"
msgstr "Bloqueado"
-#: ../stoqlib/domain/sellable.py:541
+#: ../stoqlib/domain/sellable.py:565
#, python-format
msgid ""
"The sellable with barcode '%s' doesn't exists or is not available to be sold"
@@ -5349,20 +5353,20 @@
msgid "Multiple"
msgstr "Otros Métodos"
-#: ../stoqlib/domain/payment/payment.py:72
+#: ../stoqlib/domain/payment/payment.py:74
#: ../stoqlib/domain/payment/group.py:60
msgid "Preview"
msgstr "Evaluación"
-#: ../stoqlib/domain/payment/payment.py:73
+#: ../stoqlib/domain/payment/payment.py:75
msgid "To Pay"
msgstr "A pagar"
-#: ../stoqlib/domain/payment/payment.py:75
+#: ../stoqlib/domain/payment/payment.py:77
msgid "Reviewing"
msgstr "Revisión"
-#: ../stoqlib/domain/payment/payment.py:301
+#: ../stoqlib/domain/payment/payment.py:304
msgid "NOT PAID"
msgstr "SIN PAGAR"
@@ -5394,17 +5398,17 @@
msgid "%s/%s %s for %s"
msgstr "%s/%s %s referente a %s"
-#: ../stoqlib/domain/payment/group.py:206
+#: ../stoqlib/domain/payment/group.py:212
#, python-format
msgid "sale %s"
msgstr "venta %s"
-#: ../stoqlib/domain/payment/group.py:208
+#: ../stoqlib/domain/payment/group.py:214
#, python-format
msgid "order %s"
msgstr "pedido %s"
-#: ../stoqlib/domain/payment/group.py:210
+#: ../stoqlib/domain/payment/group.py:216
#, fuzzy, python-format
msgid "renegotiation %s"
msgstr "Identificación"
@@ -5630,9 +5634,9 @@
msgstr "Impuesto"
#: ../plugins/ecf/deviceconstanteditor.py:205
-#: ../data/glade/SaleDetailsDialog.glade.h:9
+#: ../data/glade/SaleDetailsDialog.glade.h:10
#: ../data/glade/RenegotiationDetailsDialog.glade.h:9
-#: ../data/glade/PurchaseDetailsDialog.glade.h:17
+#: ../data/glade/PurchaseDetailsDialog.glade.h:16
#: ../data/glade/ClientDetailsDialog.glade.h:4
#: ../data/glade/SupplierDetailsDialog.glade.h:3
msgid "Payments"
@@ -5807,8 +5811,6 @@
#: ../data/glade/SaleDiscountSlave.glade.h:2
#: ../data/glade/TributarySituationSlave.glade.h:2
#: ../data/glade/SellablePriceEditor.glade.h:2
-#: ../data/glade/PurchaseDetailsDialog.glade.h:2
-#: ../data/glade/StartPurchaseStep.glade.h:2
#: ../data/glade/PaymentMethodEditor.glade.h:2
#: ../data/glade/ProductSupplierEditor.glade.h:2
#: ../data/glade/SellableCategoryDataSlave.glade.h:2
@@ -5883,7 +5885,6 @@
#: ../data/glade/SalesPersonStep.glade.h:1
#: ../data/glade/ProductAdjustmentDialog.glade.h:1
#: ../data/glade/SellablePriceEditor.glade.h:6
-#: ../data/glade/StartPurchaseStep.glade.h:3
#: ../data/glade/PaymentMethodEditor.glade.h:4
#: ../data/glade/ProductSupplierEditor.glade.h:3
#: ../data/glade/PurchasePaymentStep.glade.h:1
@@ -5904,7 +5905,7 @@
msgstr "Eritrea"
#: ../data/glade/SalesPersonStep.glade.h:5
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:9
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:12
msgid "Notes..."
msgstr "Notas..."
@@ -5913,13 +5914,13 @@
msgstr "Detalles del Pedido"
#: ../data/glade/SalesPersonStep.glade.h:7
-#: ../data/glade/SaleDetailsDialog.glade.h:10
+#: ../data/glade/SaleDetailsDialog.glade.h:12
#: ../data/glade/PurchaseDetailsDialog.glade.h:19
msgid "Salesperson:"
msgstr "Vendedor:"
#: ../data/glade/SalesPersonStep.glade.h:8
-#: ../data/glade/SaleDetailsDialog.glade.h:12
+#: ../data/glade/SaleDetailsDialog.glade.h:14
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:4
#: ../data/glade/RenegotiationDetailsDialog.glade.h:12
#: ../data/glade/PurchaseDetailsDialog.glade.h:20
@@ -5934,25 +5935,45 @@
#: ../data/glade/SaleDetailsDialog.glade.h:2
#: ../data/glade/RenegotiationDetailsDialog.glade.h:2
-#: ../data/glade/PurchaseDetailsDialog.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:3
#, fuzzy
msgid "Changes"
msgstr "Cambio"
-#: ../data/glade/SaleDetailsDialog.glade.h:7
+#: ../data/glade/SaleDetailsDialog.glade.h:6
+#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:8
+#: ../data/glade/PaymentMethodEditor.glade.h:7
+msgid "Interest:"
+msgstr "Interés:"
+
+#: ../data/glade/SaleDetailsDialog.glade.h:8
#: ../data/glade/RenegotiationDetailsDialog.glade.h:7
#: ../data/glade/FinishPurchaseStep.glade.h:3
#: ../data/glade/ReceivingOrderDetailsDialog.glade.h:1
msgid "Notes"
msgstr "Notas"
-#: ../data/glade/SaleDetailsDialog.glade.h:13
+#: ../data/glade/SaleDetailsDialog.glade.h:11
+#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:8
+#: ../data/glade/PurchaseDetailsDialog.glade.h:17
+msgid "Penalty:"
+msgstr "Penalización:"
+
+#: ../data/glade/SaleDetailsDialog.glade.h:15
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:5
#: ../data/glade/RenegotiationDetailsDialog.glade.h:13
#: ../data/glade/PurchaseDetailsDialog.glade.h:22
msgid "Surcharge:"
msgstr "Recargo:"
+#: ../data/glade/SaleDetailsDialog.glade.h:16
+#: ../data/glade/PurchaseDetailsDialog.glade.h:23
+#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:3
+#: ../data/glade/SaleReturnSlave.glade.h:11
+msgid "Total Paid:"
+msgstr "Total Pagado:"
+
#: ../data/glade/QuoteSupplierStep.glade.h:1
msgid "Include all products in quotes"
msgstr ""
@@ -6004,11 +6025,6 @@
msgid "History"
msgstr "Histórico de Cargos"
-#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:5
-#: ../data/glade/PaymentMethodEditor.glade.h:7
-msgid "Interest:"
-msgstr "Interés:"
-
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:6
#: ../data/glade/InstallmentConfirmation.glade.h:7
msgid "Paid date:"
@@ -6019,10 +6035,6 @@
msgid "Paid value:"
msgstr "Valor Pagado"
-#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:8
-msgid "Penalty:"
-msgstr "Penalización:"
-
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:10
#: ../data/glade/DeviceConstantEditor.glade.h:5
#: ../data/glade/SellableTaxConstantEditor.glade.h:2
@@ -6171,7 +6183,7 @@
msgstr "Cónyuge:"
#: ../data/glade/NoteSlave.glade.h:1
-#: ../data/glade/PurchaseDetailsDialog.glade.h:10
+#: ../data/glade/PurchaseDetailsDialog.glade.h:9
msgid "Notes:"
msgstr "Notas:"
@@ -6439,33 +6451,39 @@
msgid "Phone Number:"
msgstr "Teléfono:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:3
+#: ../data/glade/PurchaseDetailsDialog.glade.h:1
msgid "Additional Info"
msgstr "Informaciones Adicionales"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:7
+#: ../data/glade/PurchaseDetailsDialog.glade.h:5
+#: ../data/glade/StartPurchaseStep.glade.h:5
+#, fuzzy
+msgid "Expected Freight:"
+msgstr "Fecha esperada para recepción:"
+
+#: ../data/glade/PurchaseDetailsDialog.glade.h:6
#: ../data/glade/FinishPurchaseStep.glade.h:2
msgid "Expected Receival Date:"
msgstr "Fecha esperada para recepción:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:8
-#: ../data/glade/StartPurchaseStep.glade.h:8
+#: ../data/glade/PurchaseDetailsDialog.glade.h:7
+#: ../data/glade/StartPurchaseStep.glade.h:7
msgid "Freight Type:"
msgstr "Tipo de Flete:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:11
+#: ../data/glade/PurchaseDetailsDialog.glade.h:10
#: ../data/glade/CreditProviderMethodSlave.glade.h:3
msgid "Number of Installments:"
msgstr "Número de Plazos:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:13
+#: ../data/glade/PurchaseDetailsDialog.glade.h:12
#: ../data/glade/PaymentChangeDialog.glade.h:2
-#: ../data/glade/StartPurchaseStep.glade.h:11
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:10
+#: ../data/glade/StartPurchaseStep.glade.h:9
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:13
msgid "Order Number:"
msgstr "Número del Pedido:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:14
+#: ../data/glade/PurchaseDetailsDialog.glade.h:13
msgid "Order Status:"
msgstr "Situación del Pedido:"
@@ -6514,7 +6532,12 @@
msgid "Price ($CURRENCY):"
msgstr ""
-#: ../data/glade/StartPurchaseStep.glade.h:4
+#: ../data/glade/StartPurchaseStep.glade.h:1
+#, fuzzy
+msgid "$CURRENCY"
+msgstr "Flete (%)"
+
+#: ../data/glade/StartPurchaseStep.glade.h:2
msgid "A_dd/Edit Supplier..."
msgstr "Añadir/Editar Suministrador..."
@@ -6538,11 +6561,6 @@
"the remaining value.</b>"
msgstr ""
-#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:3
-#: ../data/glade/SaleReturnSlave.glade.h:11
-msgid "Total Paid:"
-msgstr "Total Pagado:"
-
#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:5
#, fuzzy
msgid "kiwilabel1"
@@ -6751,7 +6769,7 @@
msgstr "Detalles"
#: ../data/glade/InstallmentConfirmation.glade.h:3
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:3
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:4
#, fuzzy
msgid "Discount ($CURRENCY):"
msgstr "Descuento:"
@@ -6877,7 +6895,7 @@
msgstr "Contraseña:"
#: ../data/glade/ProductsAdjustment.glade.h:4
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:7
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:10
#: ../data/glade/FiscalBookEntryEditor.glade.h:3
msgid "Invoice Number:"
msgstr "Número de Factura:"
@@ -6973,35 +6991,43 @@
msgid "Financial Status:"
msgstr "Situación Financiera:"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:4
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:3
+msgid "Create a separate payment for freight"
+msgstr ""
+
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:5
#, fuzzy
msgid "Freight ($CURRENCY):"
msgstr "Flete (%)"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:5
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:7
#, fuzzy
msgid "ICMS Total ($CURRENCY):"
msgstr "IVA Total:"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:6
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:8
msgid "IPI ($CURRENCY):"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:8
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:9
+msgid "Include freight value in installments"
+msgstr ""
+
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:11
#, fuzzy
msgid "Invoice Total ($CURRENCY):"
msgstr "Total Factura:"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:11
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:14
msgid "Others Expenditures ($CURRENCY):"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:12
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:15
#, fuzzy
msgid "Products Total ($CURRENCY):"
msgstr "Total productos:"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:13
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:16
msgid "Secure ($CURRENCY):"
msgstr ""
@@ -7452,6 +7478,20 @@
msgid "TRANSFER RECEIPT"
msgstr "RECIBO"
+#, fuzzy
+#~ msgid "Payment number"
+#~ msgstr "Tipo de Pago"
+
+#, fuzzy
+#~ msgid "Additional Instructions:"
+#~ msgstr "_Instrucciones Adicionales"
+
+#~ msgid "Total %s"
+#~ msgstr "Total %s"
+
+#~ msgid "Received Date"
+#~ msgstr "Fecha de recepción"
+
#~ msgid "Quantity Sold"
#~ msgstr "Cantidad Vendida"
Modified: stoqlib/trunk/po/pt_BR.po
==============================================================================
--- stoqlib/trunk/po/pt_BR.po Mon Jul 6 15:54:12 2009 (r8146)
+++ stoqlib/trunk/po/pt_BR.po Mon Jul 6 15:54:49 2009 (r8147)
@@ -24,7 +24,7 @@
msgstr ""
"Project-Id-Version: stoq 0.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 10:45-0300\n"
+"POT-Creation-Date: 2009-07-06 15:52-0300\n"
"PO-Revision-Date: 2008-05-28 17:56-0300\n"
"Last-Translator: Silvio Rangel <silvio at async.com.br>\n"
"Language-Team: Brazilian portuguese <pt_BR at li.org>\n"
@@ -32,209 +32,33 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../stoqlib/reporting/payment.py:37
+#: ../stoqlib/reporting/payment.py:35
msgid "Payment Report"
msgstr "Relatório de Pagamento"
-#: ../stoqlib/reporting/payment.py:52 ../stoqlib/reporting/service.py:72
-#: ../stoqlib/reporting/template.py:321 ../stoqlib/reporting/sale.py:111
-#: ../stoqlib/reporting/sale.py:255
-#: ../stoqlib/reporting/purchase_receival.py:63
-#: ../stoqlib/reporting/till.py:64 ../stoqlib/gui/editors/producteditor.py:138
-#: ../stoqlib/gui/search/salesearch.py:91
-#: ../stoqlib/gui/dialogs/tillhistory.py:80
-#: ../stoqlib/gui/dialogs/receivingdialog.py:71
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:92
-#: ../stoqlib/gui/dialogs/saledetails.py:105
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:70
-#: ../stoqlib/gui/dialogs/clientdetails.py:112
-#: ../stoqlib/gui/dialogs/supplierdetails.py:108
-#: ../stoqlib/gui/dialogs/purchasedetails.py:109
-#: ../stoqlib/gui/dialogs/productstockdetails.py:91
-#: ../data/glade/SalesPersonStep.glade.h:9
-#: ../data/glade/SaleDetailsDialog.glade.h:14
-#: ../data/glade/PurchaseItemEditor.glade.h:8
-#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:6
-#: ../data/glade/MultipleMethodSlave.glade.h:5
-#: ../data/glade/RenegotiationDetailsDialog.glade.h:14
-#: ../data/glade/PurchaseDetailsDialog.glade.h:23
-#: ../data/glade/ReceivingItemEditor.glade.h:8
-#: ../data/glade/PurchasePaymentStep.glade.h:4
-#: ../data/glade/SaleQuoteItemEditor.glade.h:6
-msgid "Total:"
-msgstr "Total:"
-
-#: ../stoqlib/reporting/payment.py:65 ../stoqlib/reporting/sale.py:170
-#: ../stoqlib/gui/search/salesearch.py:68
-#: ../stoqlib/gui/search/paymentsearch.py:76
-#: ../stoqlib/gui/wizards/receivingwizard.py:96
-#: ../stoqlib/gui/dialogs/tillhistory.py:61
-msgid "Number"
-msgstr "Número"
-
-#: ../stoqlib/reporting/payment.py:67 ../stoqlib/reporting/payment.py:94
-#: ../stoqlib/reporting/service.py:56 ../stoqlib/reporting/template.py:311
-#: ../stoqlib/reporting/product.py:166 ../stoqlib/reporting/purchase.py:166
-#: ../stoqlib/reporting/till.py:52 ../stoqlib/gui/editors/tilleditor.py:212
-#: ../stoqlib/gui/editors/invoiceeditor.py:228
-#: ../stoqlib/gui/editors/invoiceeditor.py:286
-#: ../stoqlib/gui/editors/sellableeditor.py:102
-#: ../stoqlib/gui/editors/producteditor.py:124
-#: ../stoqlib/gui/search/servicesearch.py:110
-#: ../stoqlib/gui/search/fiscalsearch.py:72
-#: ../stoqlib/gui/search/categorysearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:154
-#: ../stoqlib/gui/search/productsearch.py:229
-#: ../stoqlib/gui/search/productsearch.py:275
-#: ../stoqlib/gui/search/purchasesearch.py:78
-#: ../stoqlib/gui/search/sellablesearch.py:122
-#: ../stoqlib/gui/search/tillsearch.py:118
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:80
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:125
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:88
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:114
-#: ../stoqlib/gui/wizards/salequotewizard.py:169
-#: ../stoqlib/gui/wizards/purchasewizard.py:235
-#: ../stoqlib/gui/wizards/receivingwizard.py:243
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:131
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:465
-#: ../stoqlib/gui/dialogs/quotedialog.py:91
-#: ../stoqlib/gui/dialogs/initialstockdialog.py:83
-#: ../stoqlib/gui/dialogs/openinventorydialog.py:141
-#: ../stoqlib/gui/dialogs/tillhistory.py:65
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:103
-#: ../stoqlib/gui/dialogs/receivingdialog.py:83
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:124
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:142
-#: ../stoqlib/gui/dialogs/productcountingdialog.py:75
-#: ../stoqlib/gui/dialogs/devices.py:50
-#: ../stoqlib/gui/dialogs/saledetails.py:152
-#: ../stoqlib/gui/dialogs/saledetails.py:173
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:81
-#: ../stoqlib/gui/dialogs/clientdetails.py:137
-#: ../stoqlib/gui/dialogs/clientdetails.py:148
-#: ../stoqlib/gui/dialogs/clientdetails.py:159
-#: ../stoqlib/gui/dialogs/supplierdetails.py:131
-#: ../stoqlib/gui/dialogs/supplierdetails.py:144
-#: ../stoqlib/gui/dialogs/purchasedetails.py:157
-#: ../stoqlib/gui/dialogs/purchasedetails.py:170
-#: ../stoqlib/gui/dialogs/purchasedetails.py:186
-#: ../stoqlib/gui/slaves/installmentslave.py:228
-#: ../stoqlib/gui/slaves/paymentslave.py:1035
-msgid "Description"
-msgstr "Descrição"
-
-#: ../stoqlib/reporting/payment.py:69
-#: ../stoqlib/gui/search/fiscalsearch.py:128
-msgid "Drawee"
-msgstr "Sacado/Fornecedor"
-
-#: ../stoqlib/reporting/payment.py:72 ../stoqlib/reporting/payment.py:99
-#: ../stoqlib/reporting/payment.py:133 ../stoqlib/reporting/purchase.py:168
-msgid "Due date"
-msgstr "Data do Vencimento"
-
-#: ../stoqlib/reporting/payment.py:74 ../stoqlib/reporting/payment.py:101
-#: ../stoqlib/reporting/payment.py:135
-#: ../stoqlib/gui/slaves/installmentslave.py:230
-msgid "Paid date"
-msgstr "Pagamento"
-
-#: ../stoqlib/reporting/payment.py:76 ../stoqlib/reporting/payment.py:103
-#: ../stoqlib/reporting/payment.py:137 ../stoqlib/reporting/sale.py:182
-#: ../stoqlib/gui/search/personsearch.py:116
-#: ../stoqlib/gui/search/personsearch.py:336
-#: ../stoqlib/gui/search/paymentsearch.py:82
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:133
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:92
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:131
-#: ../stoqlib/gui/dialogs/saledetails.py:159
-#: ../stoqlib/gui/dialogs/clientdetails.py:129
-#: ../stoqlib/gui/dialogs/clientdetails.py:164
-#: ../stoqlib/gui/dialogs/supplierdetails.py:123
-#: ../stoqlib/gui/dialogs/supplierdetails.py:149
-#: ../stoqlib/gui/dialogs/purchasedetails.py:194
-#: ../stoqlib/domain/payment/views.py:262
-msgid "Status"
-msgstr "Situação"
-
-#: ../stoqlib/reporting/payment.py:78 ../stoqlib/reporting/payment.py:105
-#: ../stoqlib/reporting/payment.py:139 ../stoqlib/reporting/purchase.py:170
-#: ../stoqlib/reporting/sale.py:235 ../stoqlib/reporting/till.py:56
+#: ../stoqlib/reporting/payment.py:48 ../stoqlib/reporting/purchase.py:169
+#: ../stoqlib/reporting/sale.py:191 ../stoqlib/reporting/till.py:49
#: ../stoqlib/gui/search/tillsearch.py:124
#: ../stoqlib/gui/search/paymentsearch.py:85
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:134
#: ../stoqlib/gui/wizards/renegotiationwizard.py:93
#: ../stoqlib/gui/dialogs/tillhistory.py:68
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:132
-#: ../stoqlib/gui/dialogs/saledetails.py:160
+#: ../stoqlib/gui/dialogs/saledetails.py:153
#: ../stoqlib/gui/dialogs/clientdetails.py:166
#: ../stoqlib/gui/dialogs/supplierdetails.py:151
-#: ../stoqlib/gui/dialogs/purchasedetails.py:195
-#: ../stoqlib/gui/slaves/installmentslave.py:231
+#: ../stoqlib/gui/dialogs/purchasedetails.py:178
+#: ../stoqlib/gui/slaves/installmentslave.py:247
#: ../stoqlib/gui/slaves/paymentslave.py:1037
#: ../plugins/ecf/deviceconstanteditor.py:136
msgid "Value"
msgstr "Valor"
-#: ../stoqlib/reporting/payment.py:92 ../stoqlib/reporting/payment.py:119
-#: ../stoqlib/reporting/purchase.py:162
-#: ../stoqlib/gui/search/fiscalsearch.py:121
-#: ../stoqlib/gui/search/transfersearch.py:89
-#: ../stoqlib/gui/search/tillsearch.py:113
-#: ../stoqlib/gui/search/paymentsearch.py:68
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:87
-#: ../stoqlib/gui/dialogs/clientdetails.py:122
-#: ../stoqlib/gui/dialogs/clientdetails.py:154
-#: ../stoqlib/gui/dialogs/supplierdetails.py:118
-#: ../stoqlib/gui/dialogs/supplierdetails.py:139
-#: ../stoqlib/gui/dialogs/productstockdetails.py:127
-#: ../stoqlib/gui/dialogs/productstockdetails.py:142
-#: ../stoqlib/gui/dialogs/productstockdetails.py:156
-#: ../stoqlib/gui/dialogs/productstockdetails.py:172
-msgid "#"
-msgstr "#"
-
-#: ../stoqlib/reporting/payment.py:96
-#: ../stoqlib/reporting/purchase_receival.py:50
-#: ../stoqlib/gui/editors/personeditor.py:249
-#: ../stoqlib/gui/editors/producteditor.py:370
-#: ../stoqlib/gui/editors/producteditor.py:390
-#: ../stoqlib/gui/search/receivingsearch.py:81
-#: ../stoqlib/gui/wizards/receivingwizard.py:102
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:183
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:352
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:467
-#: ../stoqlib/gui/dialogs/productstockdetails.py:133
-msgid "Supplier"
-msgstr "Fornecedor"
-
-#: ../stoqlib/reporting/payment.py:121
-#: ../stoqlib/gui/search/paymentsearch.py:70
-msgid "Bank"
-msgstr "Banco"
-
-#: ../stoqlib/reporting/payment.py:124
-#: ../stoqlib/reporting/purchase_receival.py:52
-#: ../stoqlib/gui/editors/personeditor.py:297
-#: ../stoqlib/gui/search/stationsearch.py:63 ../stoqlib/gui/base/search.py:303
-msgid "Branch"
-msgstr "Unidade"
-
-#: ../stoqlib/reporting/payment.py:127
-#: ../stoqlib/gui/search/paymentsearch.py:74
-msgid "Account"
-msgstr "Conta"
-
-#: ../stoqlib/reporting/payment.py:130
-msgid "Payment number"
-msgstr "Número do pagamento"
-
#: ../stoqlib/reporting/receival_receipt.py:39
msgid "Receival receipt"
msgstr "Recibo de recebimento"
-#: ../stoqlib/reporting/service.py:41 ../stoqlib/reporting/service.py:81
+#: ../stoqlib/reporting/service.py:41 ../stoqlib/reporting/service.py:63
msgid "Service Listing"
msgstr "Lista de Serviços"
@@ -245,79 +69,27 @@
msgstr "na unidade <u>%s</u>"
#: ../stoqlib/reporting/service.py:43
-#: ../stoqlib/gui/search/servicesearch.py:55
+#: ../stoqlib/gui/search/servicesearch.py:56
msgid "services"
msgstr "serviços"
-#. XXX Bug #2430 will improve this part
-#: ../stoqlib/reporting/service.py:55 ../stoqlib/reporting/template.py:310
-#: ../stoqlib/reporting/product.py:165 ../stoqlib/reporting/sale.py:81
-#: ../stoqlib/reporting/sale.py:226 ../stoqlib/reporting/till.py:50
-#: ../stoqlib/gui/editors/producteditor.py:119
-#: ../stoqlib/gui/search/servicesearch.py:106
-#: ../stoqlib/gui/search/productsearch.py:148
-#: ../stoqlib/gui/search/productsearch.py:227
-#: ../stoqlib/gui/search/productsearch.py:271
-#: ../stoqlib/gui/search/sellablesearch.py:118
-#: ../stoqlib/gui/wizards/purchasewizard.py:234
-#: ../stoqlib/gui/dialogs/initialstockdialog.py:81
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:101
-#: ../stoqlib/gui/dialogs/receivingdialog.py:81
-#: ../stoqlib/gui/dialogs/productcountingdialog.py:73
-#: ../stoqlib/gui/dialogs/saledetails.py:170
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:79
-#: ../stoqlib/gui/dialogs/clientdetails.py:135
-#: ../stoqlib/gui/dialogs/clientdetails.py:145
-#: ../stoqlib/gui/dialogs/supplierdetails.py:129
-msgid "Code"
-msgstr "Código"
-
-#: ../stoqlib/reporting/service.py:57 ../stoqlib/reporting/product.py:66
-#: ../stoqlib/reporting/purchase.py:102 ../stoqlib/reporting/purchase.py:233
+#: ../stoqlib/reporting/service.py:55 ../stoqlib/reporting/product.py:66
+#: ../stoqlib/reporting/purchase.py:102 ../stoqlib/reporting/purchase.py:232
#: ../stoqlib/gui/editors/producteditor.py:395
-#: ../stoqlib/gui/search/servicesearch.py:114
-#: ../stoqlib/gui/search/productsearch.py:163
+#: ../stoqlib/gui/search/servicesearch.py:115
+#: ../stoqlib/gui/search/productsearch.py:165
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:88
-#: ../stoqlib/gui/wizards/purchasewizard.py:245
-#: ../stoqlib/gui/wizards/receivingwizard.py:251
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:472
+#: ../stoqlib/gui/wizards/purchasewizard.py:251
+#: ../stoqlib/gui/wizards/receivingwizard.py:253
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:475
#: ../stoqlib/gui/dialogs/quotedialog.py:95
#: ../stoqlib/gui/dialogs/receivingdialog.py:88
#: ../stoqlib/gui/dialogs/transferorderdialog.py:85
-#: ../stoqlib/gui/dialogs/purchasedetails.py:163
-#: ../stoqlib/gui/dialogs/purchasedetails.py:177
+#: ../stoqlib/gui/dialogs/purchasedetails.py:146
+#: ../stoqlib/gui/dialogs/purchasedetails.py:160
msgid "Cost"
msgstr "Custo"
-#: ../stoqlib/reporting/service.py:58 ../stoqlib/reporting/template.py:313
-#: ../stoqlib/reporting/product.py:67 ../stoqlib/reporting/sale.py:88
-#: ../stoqlib/gui/search/servicesearch.py:118
-#: ../stoqlib/gui/search/productsearch.py:166
-#: ../stoqlib/gui/search/sellablesearch.py:124
-#: ../stoqlib/gui/wizards/salequotewizard.py:177
-#: ../stoqlib/gui/dialogs/saledetails.py:177
-msgid "Price"
-msgstr "Preço"
-
-#: ../stoqlib/reporting/service.py:59
-msgid "C.M."
-msgstr "M.C."
-
-#. FIXME: This column should be virtual, waiting for bug #2764
-#: ../stoqlib/reporting/service.py:62 ../stoqlib/reporting/product.py:172
-#: ../stoqlib/gui/editors/producteditor.py:123
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:86
-#: ../stoqlib/gui/wizards/salequotewizard.py:175
-#: ../stoqlib/gui/wizards/purchasewizard.py:243
-#: ../stoqlib/gui/wizards/receivingwizard.py:249
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:135
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:105
-#: ../stoqlib/gui/dialogs/productstockdetails.py:139
-#: ../stoqlib/gui/dialogs/productstockdetails.py:153
-#: ../plugins/ecf/ecfdomain.py:248
-msgid "Unit"
-msgstr "Unidade"
-
#: ../stoqlib/reporting/template.py:122
#, python-format
msgid "Phone: %s"
@@ -356,6 +128,112 @@
msgid "Totals:"
msgstr "Totais:"
+#. XXX Bug #2430 will improve this part
+#: ../stoqlib/reporting/template.py:310 ../stoqlib/reporting/product.py:165
+#: ../stoqlib/reporting/sale.py:80 ../stoqlib/reporting/sale.py:182
+#: ../stoqlib/gui/editors/producteditor.py:119
+#: ../stoqlib/gui/search/servicesearch.py:107
+#: ../stoqlib/gui/search/productsearch.py:149
+#: ../stoqlib/gui/search/productsearch.py:229
+#: ../stoqlib/gui/search/productsearch.py:273
+#: ../stoqlib/gui/search/sellablesearch.py:119
+#: ../stoqlib/gui/wizards/purchasewizard.py:240
+#: ../stoqlib/gui/dialogs/initialstockdialog.py:81
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:101
+#: ../stoqlib/gui/dialogs/receivingdialog.py:81
+#: ../stoqlib/gui/dialogs/productcountingdialog.py:73
+#: ../stoqlib/gui/dialogs/saledetails.py:163
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:79
+#: ../stoqlib/gui/dialogs/clientdetails.py:135
+#: ../stoqlib/gui/dialogs/clientdetails.py:145
+#: ../stoqlib/gui/dialogs/supplierdetails.py:129
+msgid "Code"
+msgstr "Código"
+
+#: ../stoqlib/reporting/template.py:311 ../stoqlib/reporting/product.py:166
+#: ../stoqlib/reporting/purchase.py:165
+#: ../stoqlib/gui/editors/tilleditor.py:212
+#: ../stoqlib/gui/editors/invoiceeditor.py:228
+#: ../stoqlib/gui/editors/invoiceeditor.py:286
+#: ../stoqlib/gui/editors/sellableeditor.py:102
+#: ../stoqlib/gui/editors/producteditor.py:124
+#: ../stoqlib/gui/search/servicesearch.py:111
+#: ../stoqlib/gui/search/fiscalsearch.py:72
+#: ../stoqlib/gui/search/categorysearch.py:63
+#: ../stoqlib/gui/search/productsearch.py:156
+#: ../stoqlib/gui/search/productsearch.py:231
+#: ../stoqlib/gui/search/productsearch.py:277
+#: ../stoqlib/gui/search/purchasesearch.py:78
+#: ../stoqlib/gui/search/sellablesearch.py:124
+#: ../stoqlib/gui/search/tillsearch.py:118
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:80
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:125
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:88
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:114
+#: ../stoqlib/gui/wizards/salequotewizard.py:169
+#: ../stoqlib/gui/wizards/purchasewizard.py:241
+#: ../stoqlib/gui/wizards/receivingwizard.py:245
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:132
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:468
+#: ../stoqlib/gui/dialogs/quotedialog.py:91
+#: ../stoqlib/gui/dialogs/initialstockdialog.py:83
+#: ../stoqlib/gui/dialogs/openinventorydialog.py:141
+#: ../stoqlib/gui/dialogs/tillhistory.py:65
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:103
+#: ../stoqlib/gui/dialogs/receivingdialog.py:83
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:124
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:142
+#: ../stoqlib/gui/dialogs/productcountingdialog.py:75
+#: ../stoqlib/gui/dialogs/devices.py:50
+#: ../stoqlib/gui/dialogs/saledetails.py:145
+#: ../stoqlib/gui/dialogs/saledetails.py:166
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:81
+#: ../stoqlib/gui/dialogs/clientdetails.py:137
+#: ../stoqlib/gui/dialogs/clientdetails.py:148
+#: ../stoqlib/gui/dialogs/clientdetails.py:159
+#: ../stoqlib/gui/dialogs/supplierdetails.py:131
+#: ../stoqlib/gui/dialogs/supplierdetails.py:144
+#: ../stoqlib/gui/dialogs/purchasedetails.py:140
+#: ../stoqlib/gui/dialogs/purchasedetails.py:153
+#: ../stoqlib/gui/dialogs/purchasedetails.py:169
+#: ../stoqlib/gui/slaves/installmentslave.py:244
+#: ../stoqlib/gui/slaves/paymentslave.py:1035
+msgid "Description"
+msgstr "Descrição"
+
+#: ../stoqlib/reporting/template.py:313 ../stoqlib/reporting/product.py:67
+#: ../stoqlib/reporting/sale.py:87 ../stoqlib/gui/search/servicesearch.py:119
+#: ../stoqlib/gui/search/productsearch.py:168
+#: ../stoqlib/gui/search/sellablesearch.py:126
+#: ../stoqlib/gui/wizards/salequotewizard.py:177
+#: ../stoqlib/gui/dialogs/saledetails.py:170
+msgid "Price"
+msgstr "Preço"
+
+#: ../stoqlib/reporting/template.py:321 ../stoqlib/reporting/sale.py:110
+#: ../stoqlib/reporting/sale.py:211
+#: ../stoqlib/gui/editors/producteditor.py:138
+#: ../stoqlib/gui/search/salesearch.py:91
+#: ../stoqlib/gui/dialogs/tillhistory.py:80
+#: ../stoqlib/gui/dialogs/receivingdialog.py:71
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:92
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:70
+#: ../stoqlib/gui/dialogs/clientdetails.py:112
+#: ../stoqlib/gui/dialogs/supplierdetails.py:108
+#: ../stoqlib/gui/dialogs/productstockdetails.py:91
+#: ../data/glade/SalesPersonStep.glade.h:9
+#: ../data/glade/SaleDetailsDialog.glade.h:17
+#: ../data/glade/PurchaseItemEditor.glade.h:8
+#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:6
+#: ../data/glade/MultipleMethodSlave.glade.h:5
+#: ../data/glade/RenegotiationDetailsDialog.glade.h:14
+#: ../data/glade/PurchaseDetailsDialog.glade.h:24
+#: ../data/glade/ReceivingItemEditor.glade.h:8
+#: ../data/glade/PurchasePaymentStep.glade.h:4
+#: ../data/glade/SaleQuoteItemEditor.glade.h:6
+msgid "Total:"
+msgstr "Total:"
+
#: ../stoqlib/reporting/template.py:333
msgid "Untitled"
msgstr "Sem Título"
@@ -377,42 +255,43 @@
msgstr "produtos da unidade %s"
#: ../stoqlib/reporting/product.py:68
-#: ../stoqlib/gui/search/productsearch.py:169
+#: ../stoqlib/gui/search/productsearch.py:171
msgid "Stock Total"
msgstr "Estoque"
#: ../stoqlib/reporting/product.py:92 ../stoqlib/reporting/product.py:170
-#: ../stoqlib/reporting/purchase.py:104 ../stoqlib/reporting/purchase.py:234
-#: ../stoqlib/reporting/sale.py:86 ../stoqlib/gui/editors/producteditor.py:121
+#: ../stoqlib/reporting/purchase.py:104 ../stoqlib/reporting/purchase.py:233
+#: ../stoqlib/reporting/sale.py:85 ../stoqlib/gui/editors/producteditor.py:121
+#: ../stoqlib/gui/search/salesearch.py:136
#: ../stoqlib/gui/wizards/salequotewizard.py:173
-#: ../stoqlib/gui/wizards/purchasewizard.py:239
-#: ../stoqlib/gui/wizards/receivingwizard.py:245
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:133
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:469
+#: ../stoqlib/gui/wizards/purchasewizard.py:245
+#: ../stoqlib/gui/wizards/receivingwizard.py:247
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:134
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:472
#: ../stoqlib/gui/dialogs/quotedialog.py:93
#: ../stoqlib/gui/dialogs/receivingdialog.py:85
-#: ../stoqlib/gui/dialogs/saledetails.py:175
+#: ../stoqlib/gui/dialogs/saledetails.py:168
#: ../stoqlib/gui/dialogs/transferorderdialog.py:83
-#: ../stoqlib/gui/dialogs/purchasedetails.py:160
+#: ../stoqlib/gui/dialogs/purchasedetails.py:143
#: ../stoqlib/gui/dialogs/productstockdetails.py:137
msgid "Quantity"
msgstr "Quantidade"
#: ../stoqlib/reporting/product.py:119 ../stoqlib/reporting/product.py:189
-#: ../stoqlib/gui/search/productsearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:249
+#: ../stoqlib/gui/search/productsearch.py:64
+#: ../stoqlib/gui/search/productsearch.py:251
msgid "products"
msgstr "produtos"
#: ../stoqlib/reporting/product.py:136
-#: ../stoqlib/gui/search/productsearch.py:231
+#: ../stoqlib/gui/search/productsearch.py:233
#: ../stoqlib/gui/dialogs/productstockdetails.py:150
-#: ../stoqlib/domain/sellable.py:250
+#: ../stoqlib/domain/sellable.py:248
msgid "Sold"
msgstr "Vendido"
#: ../stoqlib/reporting/product.py:137 ../stoqlib/reporting/purchase.py:68
-#: ../stoqlib/gui/search/productsearch.py:238
+#: ../stoqlib/gui/search/productsearch.py:240
#: ../stoqlib/gui/search/purchasesearch.py:82
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:84
#: ../data/glade/PurchaseDetailsDialog.glade.h:18
@@ -420,13 +299,13 @@
msgstr "Recebido"
#: ../stoqlib/reporting/product.py:138
-#: ../stoqlib/gui/search/productsearch.py:234
+#: ../stoqlib/gui/search/productsearch.py:236
#: ../stoqlib/gui/dialogs/productstockdetails.py:168
msgid "Transfered"
msgstr "Transferido"
#: ../stoqlib/reporting/product.py:140
-#: ../stoqlib/gui/search/productsearch.py:236
+#: ../stoqlib/gui/search/productsearch.py:238
msgid "Retained"
msgstr "Retido"
@@ -444,28 +323,43 @@
msgid "Fiscal Class"
msgstr "Classificação Fiscal"
+#. FIXME: This column should be virtual, waiting for bug #2764
+#: ../stoqlib/reporting/product.py:172
+#: ../stoqlib/gui/editors/producteditor.py:123
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:86
+#: ../stoqlib/gui/wizards/salequotewizard.py:175
+#: ../stoqlib/gui/wizards/purchasewizard.py:249
+#: ../stoqlib/gui/wizards/receivingwizard.py:251
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:136
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:105
+#: ../stoqlib/gui/dialogs/productstockdetails.py:139
+#: ../stoqlib/gui/dialogs/productstockdetails.py:153
+#: ../plugins/ecf/ecfdomain.py:248
+msgid "Unit"
+msgstr "Unidade"
+
#: ../stoqlib/reporting/product.py:188
msgid "Product Stock Report"
msgstr "Relatório de Estoque de Produtos"
#: ../stoqlib/reporting/product.py:208
-#: ../stoqlib/gui/search/productsearch.py:279
+#: ../stoqlib/gui/search/productsearch.py:281
msgid "Maximum"
msgstr "Máximo"
#: ../stoqlib/reporting/product.py:209
-#: ../stoqlib/gui/search/productsearch.py:282
+#: ../stoqlib/gui/search/productsearch.py:284
msgid "Minimum"
msgstr "Mínimo"
#: ../stoqlib/reporting/product.py:210
-#: ../stoqlib/gui/search/productsearch.py:284
+#: ../stoqlib/gui/search/productsearch.py:286
#: ../stoqlib/gui/search/purchasesearch.py:84
msgid "In Stock"
msgstr "Em estoque"
#: ../stoqlib/reporting/product.py:212
-#: ../stoqlib/gui/search/productsearch.py:286
+#: ../stoqlib/gui/search/productsearch.py:288
msgid "To Receive"
msgstr "A Receber"
@@ -477,51 +371,50 @@
msgid "orders"
msgstr "pedidos"
-#: ../stoqlib/reporting/purchase.py:48 ../stoqlib/reporting/sale.py:154
+#: ../stoqlib/reporting/purchase.py:48 ../stoqlib/reporting/sale.py:137
#, python-format
msgid "with status <u>%s</u>"
msgstr "com situação <u>%s</u>"
#: ../stoqlib/reporting/purchase.py:66
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:82
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:470
-#: ../stoqlib/domain/sale.py:278
-#: ../data/glade/PurchaseDetailsDialog.glade.h:15
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:473
+#: ../stoqlib/domain/sale.py:280
+#: ../data/glade/PurchaseDetailsDialog.glade.h:14
msgid "Ordered"
msgstr "Pedido"
#: ../stoqlib/reporting/purchase.py:70 ../stoqlib/reporting/purchase.py:106
-#: ../stoqlib/reporting/purchase.py:111 ../stoqlib/reporting/purchase.py:236
-#: ../stoqlib/reporting/sale.py:179 ../stoqlib/gui/search/salesearch.py:80
+#: ../stoqlib/reporting/purchase.py:111 ../stoqlib/reporting/purchase.py:235
+#: ../stoqlib/reporting/sale.py:149 ../stoqlib/gui/search/salesearch.py:80
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:89
#: ../stoqlib/gui/wizards/stocktransferwizard.py:120
#: ../stoqlib/gui/wizards/salequotewizard.py:179
-#: ../stoqlib/gui/wizards/purchasewizard.py:247
-#: ../stoqlib/gui/wizards/receivingwizard.py:253
+#: ../stoqlib/gui/wizards/purchasewizard.py:253
+#: ../stoqlib/gui/wizards/receivingwizard.py:255
#: ../stoqlib/gui/dialogs/receivingdialog.py:91
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:146
-#: ../stoqlib/gui/dialogs/saledetails.py:178
+#: ../stoqlib/gui/dialogs/saledetails.py:171
#: ../stoqlib/gui/dialogs/clientdetails.py:131
#: ../stoqlib/gui/dialogs/supplierdetails.py:125
-#: ../stoqlib/gui/dialogs/purchasedetails.py:129
-#: ../stoqlib/gui/dialogs/purchasedetails.py:165
-#: ../stoqlib/gui/dialogs/purchasedetails.py:180
+#: ../stoqlib/gui/dialogs/purchasedetails.py:112
+#: ../stoqlib/gui/dialogs/purchasedetails.py:148
+#: ../stoqlib/gui/dialogs/purchasedetails.py:163
msgid "Total"
msgstr "Total"
#: ../stoqlib/reporting/purchase.py:81
-#: ../stoqlib/reporting/purchase_receival.py:48
#: ../stoqlib/gui/dialogs/productstockdetails.py:131
msgid "Purchase Order"
msgstr "Pedido de Compra"
-#: ../stoqlib/reporting/purchase.py:95 ../stoqlib/reporting/purchase.py:228
-#: ../stoqlib/reporting/sale.py:83
+#: ../stoqlib/reporting/purchase.py:95 ../stoqlib/reporting/purchase.py:227
+#: ../stoqlib/reporting/sale.py:82 ../stoqlib/gui/search/salesearch.py:127
msgid "Item"
msgstr "Item"
#: ../stoqlib/reporting/purchase.py:109
-#: ../stoqlib/gui/wizards/receivingwizard.py:108
+#: ../stoqlib/gui/wizards/receivingwizard.py:109
msgid "Qty Received"
msgstr "Recebido"
@@ -529,50 +422,70 @@
msgid "Purchase Ordered Items"
msgstr "Itens do Pedido de Compra"
-#: ../stoqlib/reporting/purchase.py:138 ../stoqlib/reporting/purchase.py:193
-#: ../stoqlib/domain/sale.py:559
+#: ../stoqlib/reporting/purchase.py:138 ../stoqlib/reporting/purchase.py:192
+#: ../stoqlib/domain/sale.py:578
msgid "Not Specified"
msgstr "Não especificado"
-#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:239
-#: ../data/glade/PurchaseDetailsDialog.glade.h:24
+#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:238
+#: ../data/glade/PurchaseDetailsDialog.glade.h:25
#: ../data/glade/FinishPurchaseStep.glade.h:6
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:15
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:18
msgid "Transporter:"
msgstr "Transportadora:"
-#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:240
-#: ../data/glade/PurchaseDetailsDialog.glade.h:9
-#: ../data/glade/StartPurchaseStep.glade.h:9
+#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:239
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:6
#: ../data/glade/TransporterDataSlave.glade.h:4
msgid "Freight:"
msgstr "Frete:"
-#: ../stoqlib/reporting/purchase.py:154
+#: ../stoqlib/reporting/purchase.py:153
#, python-format
msgid "Payments: %d installments"
msgstr "Pagamentos: %d parcelas"
-#: ../stoqlib/reporting/purchase.py:157
+#: ../stoqlib/reporting/purchase.py:156
msgid "Payments: 1 installment"
msgstr "Pagamento: 1 parcela"
-#: ../stoqlib/reporting/purchase.py:164
+#: ../stoqlib/reporting/purchase.py:161
+#: ../stoqlib/gui/search/fiscalsearch.py:121
+#: ../stoqlib/gui/search/transfersearch.py:89
+#: ../stoqlib/gui/search/tillsearch.py:113
+#: ../stoqlib/gui/search/paymentsearch.py:68
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:87
+#: ../stoqlib/gui/dialogs/clientdetails.py:122
+#: ../stoqlib/gui/dialogs/clientdetails.py:154
+#: ../stoqlib/gui/dialogs/supplierdetails.py:118
+#: ../stoqlib/gui/dialogs/supplierdetails.py:139
+#: ../stoqlib/gui/dialogs/productstockdetails.py:127
+#: ../stoqlib/gui/dialogs/productstockdetails.py:142
+#: ../stoqlib/gui/dialogs/productstockdetails.py:156
+#: ../stoqlib/gui/dialogs/productstockdetails.py:172
+msgid "#"
+msgstr "#"
+
+#: ../stoqlib/reporting/purchase.py:163
msgid "Method"
msgstr "Método"
-#: ../stoqlib/reporting/purchase.py:181 ../stoqlib/reporting/purchase.py:247
+#: ../stoqlib/reporting/purchase.py:167
+msgid "Due date"
+msgstr "Data do Vencimento"
+
+#: ../stoqlib/reporting/purchase.py:180 ../stoqlib/reporting/purchase.py:246
#: ../data/glade/TillClosing.glade.h:5
-#: ../data/glade/SaleDetailsDialog.glade.h:8
+#: ../data/glade/SaleDetailsDialog.glade.h:9
#: ../data/glade/OpenInventoryDialog.glade.h:3
#: ../data/glade/RenegotiationDetailsDialog.glade.h:8
-#: ../data/glade/PurchaseDetailsDialog.glade.h:12
-#: ../data/glade/StartPurchaseStep.glade.h:10
+#: ../data/glade/PurchaseDetailsDialog.glade.h:11
+#: ../data/glade/StartPurchaseStep.glade.h:8
msgid "Open Date:"
msgstr "Abertura:"
-#: ../stoqlib/reporting/purchase.py:182
-#: ../data/glade/SaleDetailsDialog.glade.h:11
+#: ../stoqlib/reporting/purchase.py:181
+#: ../data/glade/SaleDetailsDialog.glade.h:13
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:9
#: ../data/glade/RenegotiationDetailsDialog.glade.h:11
#: ../data/glade/PaymentChangeDialog.glade.h:4
@@ -583,20 +496,20 @@
msgid "Status:"
msgstr "Situação:"
-#: ../stoqlib/reporting/purchase.py:183 ../stoqlib/reporting/purchase.py:250
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:334
+#: ../stoqlib/reporting/purchase.py:182 ../stoqlib/reporting/purchase.py:249
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:336
#: ../stoqlib/gui/dialogs/paymentchangedialog.py:71
#: ../data/glade/PurchaseDetailsDialog.glade.h:21
-#: ../data/glade/StartPurchaseStep.glade.h:12
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:14
+#: ../data/glade/StartPurchaseStep.glade.h:10
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:17
#: ../data/glade/SupplierDetailsDialog.glade.h:7
msgid "Supplier:"
msgstr "Fornecedor:"
-#: ../stoqlib/reporting/purchase.py:184 ../stoqlib/reporting/purchase.py:251
+#: ../stoqlib/reporting/purchase.py:183 ../stoqlib/reporting/purchase.py:250
#: ../data/glade/OpenInventoryDialog.glade.h:1
-#: ../data/glade/PurchaseDetailsDialog.glade.h:4
-#: ../data/glade/StartPurchaseStep.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:2
+#: ../data/glade/StartPurchaseStep.glade.h:3
#: ../data/glade/StationEditor.glade.h:2
#: ../data/glade/ProductsAdjustment.glade.h:1
#: ../data/glade/ReceivingInvoiceSlave.glade.h:1
@@ -604,70 +517,70 @@
msgid "Branch:"
msgstr "Unidade:"
-#: ../stoqlib/reporting/purchase.py:194
+#: ../stoqlib/reporting/purchase.py:193
#, python-format
msgid "Expected Receival Date: %s"
msgstr "Data Prevista para recebimento: %s"
-#: ../stoqlib/reporting/purchase.py:209
+#: ../stoqlib/reporting/purchase.py:208
#, python-format
msgid "Purchase Order #%s"
msgstr "Pedido de Compra %s"
-#: ../stoqlib/reporting/purchase.py:215
+#: ../stoqlib/reporting/purchase.py:214
msgid "Quote Request"
msgstr "Pedido de Cotação"
#. To be filled
-#: ../stoqlib/reporting/purchase.py:249 ../data/glade/StartQuoteStep.glade.h:2
+#: ../stoqlib/reporting/purchase.py:248 ../data/glade/StartQuoteStep.glade.h:2
msgid "Deadline:"
msgstr "Prazo"
-#: ../stoqlib/reporting/purchase.py:260
+#: ../stoqlib/reporting/purchase.py:259
msgid "Payment Settings"
msgstr "Configuração de Pagamento"
-#: ../stoqlib/reporting/purchase.py:264
-#: ../data/glade/PurchaseDetailsDialog.glade.h:16
+#: ../stoqlib/reporting/purchase.py:263
+#: ../data/glade/PurchaseDetailsDialog.glade.h:15
#: ../data/glade/PurchasePaymentStep.glade.h:2
msgid "Payment Method:"
msgstr "Forma de Pagamento:"
-#: ../stoqlib/reporting/purchase.py:264
+#: ../stoqlib/reporting/purchase.py:263
msgid "Installments:"
msgstr "Parcelas:"
-#: ../stoqlib/reporting/purchase.py:265
+#: ../stoqlib/reporting/purchase.py:264
msgid "Intervals:"
msgstr "Intervalos:"
-#: ../stoqlib/reporting/purchase.py:265
+#: ../stoqlib/reporting/purchase.py:264
msgid "Obs:"
msgstr "Obs:"
-#: ../stoqlib/reporting/purchase.py:272
+#: ../stoqlib/reporting/purchase.py:271
msgid "Quoting Items"
msgstr "Itens Cotados"
#. The supplier name here ?
-#: ../stoqlib/reporting/purchase.py:279
+#: ../stoqlib/reporting/purchase.py:278
#: ../stoqlib/gui/dialogs/productstockdetails.py:166
msgid "Responsible"
msgstr "Responsável"
-#: ../stoqlib/reporting/sale.py:48
+#: ../stoqlib/reporting/sale.py:47
msgid "Sale Order"
msgstr "Pedido de Venda"
-#: ../stoqlib/reporting/sale.py:64
+#: ../stoqlib/reporting/sale.py:63
msgid "No client"
msgstr "Sem cliente"
-#: ../stoqlib/reporting/sale.py:69
+#: ../stoqlib/reporting/sale.py:68
msgid "No phone number"
msgstr "Sem Telefone"
-#: ../stoqlib/reporting/sale.py:74 ../data/glade/SalesPersonStep.glade.h:2
+#: ../stoqlib/reporting/sale.py:73 ../data/glade/SalesPersonStep.glade.h:2
#: ../data/glade/SaleDetailsDialog.glade.h:3
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:2
#: ../data/glade/DeliveryEditor.glade.h:4
@@ -678,84 +591,53 @@
msgid "Client:"
msgstr "Cliente:"
-#: ../stoqlib/reporting/sale.py:74
+#: ../stoqlib/reporting/sale.py:73
msgid "Phone number:"
msgstr "Telefone:"
-#: ../stoqlib/reporting/sale.py:90
+#: ../stoqlib/reporting/sale.py:89
msgid "Sub-Total"
msgstr "Subtotal"
-#: ../stoqlib/reporting/sale.py:99
+#: ../stoqlib/reporting/sale.py:98
#, python-format
msgid "%s items"
msgstr "%s itens"
-#: ../stoqlib/reporting/sale.py:101
+#: ../stoqlib/reporting/sale.py:100
#, python-format
msgid "%s item"
msgstr "%s item"
-#: ../stoqlib/reporting/sale.py:111 ../data/glade/SaleDetailsDialog.glade.h:5
+#: ../stoqlib/reporting/sale.py:110 ../data/glade/SaleDetailsDialog.glade.h:5
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:2
#: ../data/glade/SaleDiscountSlave.glade.h:3
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:3
#: ../data/glade/RenegotiationDetailsDialog.glade.h:5
-#: ../data/glade/PurchaseDetailsDialog.glade.h:6
+#: ../data/glade/PurchaseDetailsDialog.glade.h:4
msgid "Discount:"
msgstr "Desconto:"
-#: ../stoqlib/reporting/sale.py:125
-msgid "Additional Instructions:"
-msgstr "Instruções _Adicionais:"
-
-#: ../stoqlib/reporting/sale.py:138
-msgid "Delivery Address:"
-msgstr "Endereço de Entrega:"
+#: ../stoqlib/reporting/sale.py:121 ../stoqlib/gui/wizards/salewizard.py:359
+#: ../stoqlib/gui/wizards/salequotewizard.py:128
+#: ../stoqlib/gui/slaves/receivingslave.py:125
+msgid "Additional Information"
+msgstr "Informação Adicional"
-#: ../stoqlib/reporting/sale.py:146
+#: ../stoqlib/reporting/sale.py:129
#, python-format
msgid "Sale Order on %s"
msgstr "Pedido sobre Venda %s"
-#: ../stoqlib/reporting/sale.py:152
+#: ../stoqlib/reporting/sale.py:135
msgid "Sales Report"
msgstr "Relatório de Vendas"
-#: ../stoqlib/reporting/sale.py:153
+#: ../stoqlib/reporting/sale.py:136
msgid "sales"
msgstr "vendas"
-#: ../stoqlib/reporting/sale.py:172 ../stoqlib/reporting/till.py:54
-#: ../stoqlib/gui/search/fiscalsearch.py:123
-#: ../stoqlib/gui/search/commissionsearch.py:81
-#: ../stoqlib/gui/search/tillsearch.py:116
-#: ../stoqlib/gui/dialogs/tillhistory.py:63
-#: ../stoqlib/gui/dialogs/clientdetails.py:125
-#: ../stoqlib/gui/dialogs/supplierdetails.py:121
-#: ../stoqlib/gui/dialogs/productstockdetails.py:129
-#: ../data/glade/FiscalMemoryEditor.glade.h:2
-msgid "Date"
-msgstr "Data"
-
-#: ../stoqlib/reporting/sale.py:174 ../stoqlib/gui/editors/personeditor.py:57
-#: ../stoqlib/gui/search/salesearch.py:72
-#: ../stoqlib/gui/dialogs/productstockdetails.py:149
-msgid "Client"
-msgstr "Cliente"
-
-#: ../stoqlib/reporting/sale.py:177 ../stoqlib/gui/search/salesearch.py:75
-#: ../stoqlib/gui/search/commissionsearch.py:71
-#: ../stoqlib/gui/dialogs/clientdetails.py:127
-msgid "Salesperson"
-msgstr "Vendedor"
-
-#: ../stoqlib/reporting/sale.py:190
-#, python-format
-msgid "Total %s"
-msgstr "Total %s"
-
-#: ../stoqlib/reporting/sale.py:202 ../stoqlib/lib/parameters.py:71
+#: ../stoqlib/reporting/sale.py:158 ../stoqlib/lib/parameters.py:71
#: ../stoqlib/lib/parameters.py:102 ../stoqlib/lib/parameters.py:116
#: ../stoqlib/lib/parameters.py:122 ../stoqlib/lib/parameters.py:130
#: ../stoqlib/lib/parameters.py:154 ../stoqlib/lib/parameters.py:166
@@ -770,18 +652,18 @@
msgid "Sales"
msgstr "Vendas"
-#: ../stoqlib/reporting/sale.py:208
+#: ../stoqlib/reporting/sale.py:164
#, python-format
msgid "sales on branch %s"
msgstr "vendas na unidade %s"
-#: ../stoqlib/reporting/sale.py:211
+#: ../stoqlib/reporting/sale.py:167
#, python-format
msgid "sales from %s on branch %s"
msgstr "vendas para %s na unidade %s"
#. ListDialog
-#: ../stoqlib/reporting/sale.py:223 ../stoqlib/gui/search/stationsearch.py:57
+#: ../stoqlib/reporting/sale.py:179 ../stoqlib/gui/search/stationsearch.py:57
#: ../stoqlib/gui/search/personsearch.py:111
#: ../stoqlib/gui/search/personsearch.py:140
#: ../stoqlib/gui/search/personsearch.py:179
@@ -794,67 +676,58 @@
msgid "Name"
msgstr "Nome"
-#: ../stoqlib/reporting/sale.py:228
+#: ../stoqlib/reporting/sale.py:184
msgid "Total Amount"
msgstr "Total"
-#: ../stoqlib/reporting/sale.py:230
+#: ../stoqlib/reporting/sale.py:186
msgid "P/A"
msgstr "P/A"
-#: ../stoqlib/reporting/sale.py:232
+#: ../stoqlib/reporting/sale.py:188
msgid "Percentage"
msgstr "Porcentagem"
-#: ../stoqlib/reporting/sale.py:237
+#: ../stoqlib/reporting/sale.py:193
msgid "S/P"
msgstr "S/P"
-#: ../stoqlib/reporting/sale.py:272
+#: ../stoqlib/reporting/sale.py:228
#, python-format
msgid "Sold value per sales %s"
msgstr "Valor médio por venda %s"
-#: ../stoqlib/reporting/sale.py:279
+#: ../stoqlib/reporting/sale.py:235
msgid "P/A: Payment Amount"
msgstr "P/A: Total dos pagamentos"
-#: ../stoqlib/reporting/sale.py:280
+#: ../stoqlib/reporting/sale.py:236
msgid "S/P: Sellables sold per sale"
msgstr "S/P: Número de Produtos por venda"
-#: ../stoqlib/reporting/sale.py:283
+#: ../stoqlib/reporting/sale.py:239
#, python-format
msgid "Total of sales: %d"
msgstr "Total de venda: %d"
-#: ../stoqlib/reporting/purchase_receival.py:35
+#: ../stoqlib/reporting/purchase_receival.py:34
msgid "Purchase Receival Report"
msgstr "Relatório de Recebimento de Compras"
-#: ../stoqlib/reporting/purchase_receival.py:36
+#: ../stoqlib/reporting/purchase_receival.py:35
msgid "purchase receivals"
msgstr "recebimentos de compra"
-#: ../stoqlib/reporting/purchase_receival.py:46
-msgid "Received Date"
-msgstr "Data de Recebimento"
-
-#: ../stoqlib/reporting/purchase_receival.py:54
-#: ../stoqlib/gui/search/receivingsearch.py:83
-msgid "Invoice #"
-msgstr "N.F. #"
-
-#: ../stoqlib/reporting/purchase_receival.py:55
+#: ../stoqlib/reporting/purchase_receival.py:47
#: ../stoqlib/gui/search/receivingsearch.py:85
msgid "Invoice Total"
msgstr "Total N.F."
-#: ../stoqlib/reporting/till.py:38
+#: ../stoqlib/reporting/till.py:37
msgid "Till History Listing"
msgstr "Relatório de Histórico de Caixa"
-#: ../stoqlib/reporting/till.py:39
+#: ../stoqlib/reporting/till.py:38
msgid "till history"
msgstr "histórico de caixa"
@@ -910,7 +783,7 @@
#: ../stoqlib/lib/parameters.py:77 ../stoqlib/lib/parameters.py:83
#: ../stoqlib/lib/parameters.py:89 ../stoqlib/lib/parameters.py:220
-#: ../stoqlib/lib/invoice.py:302
+#: ../stoqlib/lib/invoice.py:304
msgid "Purchase"
msgstr "Compras"
@@ -969,7 +842,7 @@
msgstr "O serviço de entrega padrão no sistema."
#: ../stoqlib/lib/parameters.py:107
-#: ../stoqlib/gui/search/sellablesearch.py:126
+#: ../stoqlib/gui/search/sellablesearch.py:128
#: ../stoqlib/gui/wizards/stocktransferwizard.py:116
msgid "Stock"
msgstr "Estoque"
@@ -1307,135 +1180,135 @@
msgid "There is no defined %s parameter datain the database."
msgstr "Não há nenhum dado do parametro %s definido na base de dados."
-#: ../stoqlib/lib/invoice.py:294 ../stoqlib/gui/search/commissionsearch.py:69
+#: ../stoqlib/lib/invoice.py:296 ../stoqlib/gui/search/commissionsearch.py:69
msgid "Sale"
msgstr "Venda"
-#: ../stoqlib/lib/invoice.py:339
+#: ../stoqlib/lib/invoice.py:341
msgid "Company document number"
msgstr "CNPJ"
-#: ../stoqlib/lib/invoice.py:350
+#: ../stoqlib/lib/invoice.py:352
msgid "Outgoing invoice"
msgstr "Nota Fiscal de Saída"
-#: ../stoqlib/lib/invoice.py:361
+#: ../stoqlib/lib/invoice.py:363
msgid "Incoming invoice"
msgstr "Nota Fiscal de Entrada"
-#: ../stoqlib/lib/invoice.py:371
+#: ../stoqlib/lib/invoice.py:373
msgid "Client name"
msgstr "Nome do Cliente"
-#: ../stoqlib/lib/invoice.py:381
+#: ../stoqlib/lib/invoice.py:383
msgid "Client Address"
msgstr "Endereço do Cliente"
-#: ../stoqlib/lib/invoice.py:391
+#: ../stoqlib/lib/invoice.py:393
msgid "Client's document number"
msgstr "CPF do Cliente"
-#: ../stoqlib/lib/invoice.py:407
+#: ../stoqlib/lib/invoice.py:409
msgid "Client's district"
msgstr "Bairro do Cliente"
-#: ../stoqlib/lib/invoice.py:417
+#: ../stoqlib/lib/invoice.py:419
msgid "Client's postal code"
msgstr "CEP do Cliente"
-#: ../stoqlib/lib/invoice.py:427
+#: ../stoqlib/lib/invoice.py:429
msgid "Client's city"
msgstr "Cidade do Cliente"
-#: ../stoqlib/lib/invoice.py:437
+#: ../stoqlib/lib/invoice.py:439
msgid "Client Phone number"
msgstr "Telefone do Cliente"
-#: ../stoqlib/lib/invoice.py:446
+#: ../stoqlib/lib/invoice.py:448
msgid "Client Fax number"
msgstr "Número do Fax do Cliente"
-#: ../stoqlib/lib/invoice.py:455
+#: ../stoqlib/lib/invoice.py:457
msgid "Client Phone/Fax number"
msgstr "Número Telefone/Fax do Cliente"
-#: ../stoqlib/lib/invoice.py:467
+#: ../stoqlib/lib/invoice.py:469
msgid "Client state abbreviation"
msgstr "Estado do Cliente"
-#: ../stoqlib/lib/invoice.py:477
+#: ../stoqlib/lib/invoice.py:479
msgid "Clients state registry number or document number"
msgstr "Inscrição Estadual do Cliente"
-#: ../stoqlib/lib/invoice.py:491
+#: ../stoqlib/lib/invoice.py:493
msgid "Emission date"
msgstr "Data de Emissão"
-#: ../stoqlib/lib/invoice.py:501
+#: ../stoqlib/lib/invoice.py:503
msgid "Creation date"
msgstr "Data de Criação"
-#: ../stoqlib/lib/invoice.py:511
+#: ../stoqlib/lib/invoice.py:513
msgid "Creation time"
msgstr "Hora de Criação"
-#: ../stoqlib/lib/invoice.py:521
+#: ../stoqlib/lib/invoice.py:523
msgid "Number of payments"
msgstr "Número de Parcelas"
-#: ../stoqlib/lib/invoice.py:531
+#: ../stoqlib/lib/invoice.py:533
msgid "Payment due dates"
msgstr "Vencimentos dos Pagamentos"
-#: ../stoqlib/lib/invoice.py:541
+#: ../stoqlib/lib/invoice.py:544
msgid "Payment values"
msgstr "Valor dos Pagamentos"
-#: ../stoqlib/lib/invoice.py:696
+#: ../stoqlib/lib/invoice.py:699
msgid "Product item counter"
msgstr "Contador de Produtos"
-#: ../stoqlib/lib/invoice.py:708
+#: ../stoqlib/lib/invoice.py:711
msgid "Product item code / description"
msgstr "Código de Produto / Descrição"
-#: ../stoqlib/lib/invoice.py:724
+#: ../stoqlib/lib/invoice.py:727
msgid "Product item description"
msgstr "Descrição de Produto"
-#: ../stoqlib/lib/invoice.py:737
+#: ../stoqlib/lib/invoice.py:740
msgid "Product item code"
msgstr "Código do Produtos"
-#: ../stoqlib/lib/invoice.py:751
+#: ../stoqlib/lib/invoice.py:754
msgid "Product item situation"
msgstr "Situação do Produto"
-#: ../stoqlib/lib/invoice.py:764
+#: ../stoqlib/lib/invoice.py:767
msgid "Product item unit"
msgstr "Unidade do Produto"
-#: ../stoqlib/lib/invoice.py:777
+#: ../stoqlib/lib/invoice.py:780
msgid "Product item quantity"
msgstr "Quantidade de Produto"
-#: ../stoqlib/lib/invoice.py:790
+#: ../stoqlib/lib/invoice.py:793
msgid "Product item price"
msgstr "Preço do Produto"
-#: ../stoqlib/lib/invoice.py:803
+#: ../stoqlib/lib/invoice.py:806
msgid "Product item total (price * quantity)"
msgstr "Total Produto (preço * quantidade)"
-#: ../stoqlib/lib/invoice.py:816
+#: ../stoqlib/lib/invoice.py:819
msgid "Product item tax"
msgstr "icms do Produto"
-#: ../stoqlib/lib/invoice.py:834
+#: ../stoqlib/lib/invoice.py:837
msgid "Invoice Type"
msgstr "Tipo de Nota"
-#: ../stoqlib/lib/invoice.py:855
+#: ../stoqlib/lib/invoice.py:858
msgid "State registry number"
msgstr "Inscrição Estadual"
@@ -2419,23 +2292,23 @@
msgid "You need to have a State Registry set on Company %s"
msgstr "Você precisa ter uma Inscrição Estadual cadastrada para empresa %s"
-#: ../stoqlib/lib/defaults.py:58 ../stoqlib/domain/product.py:111
+#: ../stoqlib/lib/defaults.py:59 ../stoqlib/domain/product.py:111
msgid "Days"
msgstr "Dias"
-#: ../stoqlib/lib/defaults.py:59
+#: ../stoqlib/lib/defaults.py:60
msgid "Weeks"
msgstr "Semanas"
-#: ../stoqlib/lib/defaults.py:60
+#: ../stoqlib/lib/defaults.py:61
msgid "Months"
msgstr "Meses"
-#: ../stoqlib/lib/defaults.py:61
+#: ../stoqlib/lib/defaults.py:62
msgid "Years"
msgstr "Anos"
-#: ../stoqlib/lib/defaults.py:155
+#: ../stoqlib/lib/defaults.py:156
msgid "All branches"
msgstr "Todas as Unidades"
@@ -2741,6 +2614,13 @@
msgid "Layout"
msgstr "Layout"
+#: ../stoqlib/gui/editors/personeditor.py:57
+#: ../stoqlib/gui/search/salesearch.py:72
+#: ../stoqlib/gui/search/salesearch.py:129
+#: ../stoqlib/gui/dialogs/productstockdetails.py:149
+msgid "Client"
+msgstr "Cliente"
+
#: ../stoqlib/gui/editors/personeditor.py:58
msgid "New Client"
msgstr "Novo Cliente"
@@ -2797,6 +2677,18 @@
msgid "Role Name:"
msgstr "Nome do Cargo:"
+#: ../stoqlib/gui/editors/personeditor.py:249
+#: ../stoqlib/gui/editors/producteditor.py:370
+#: ../stoqlib/gui/editors/producteditor.py:390
+#: ../stoqlib/gui/search/receivingsearch.py:81
+#: ../stoqlib/gui/wizards/receivingwizard.py:103
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:184
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:354
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:470
+#: ../stoqlib/gui/dialogs/productstockdetails.py:133
+msgid "Supplier"
+msgstr "Fornecedor"
+
#: ../stoqlib/gui/editors/personeditor.py:250
msgid "New Supplier"
msgstr "Novo Fornecedor"
@@ -2809,6 +2701,11 @@
msgid "New Transporter"
msgstr "Nova Transportadora"
+#: ../stoqlib/gui/editors/personeditor.py:297
+#: ../stoqlib/gui/search/stationsearch.py:63 ../stoqlib/gui/base/search.py:353
+msgid "Branch"
+msgstr "Unidade"
+
#: ../stoqlib/gui/editors/personeditor.py:298
msgid "New Branch"
msgstr "Nova Unidade"
@@ -2823,10 +2720,10 @@
#: ../stoqlib/gui/editors/categoryeditor.py:94
#: ../stoqlib/gui/editors/producteditor.py:126
-#: ../stoqlib/gui/search/productsearch.py:152
-#: ../stoqlib/gui/search/productsearch.py:273
+#: ../stoqlib/gui/search/productsearch.py:154
+#: ../stoqlib/gui/search/productsearch.py:275
#: ../stoqlib/gui/wizards/salequotewizard.py:171
-#: ../stoqlib/gui/wizards/purchasewizard.py:237
+#: ../stoqlib/gui/wizards/purchasewizard.py:243
#: ../stoqlib/gui/dialogs/paymentcategorydialog.py:50
msgid "Category"
msgstr "Categoria"
@@ -2870,41 +2767,70 @@
msgid "This unit type requires weighing"
msgstr "Este tipo de unidade requer pesagem"
-#: ../stoqlib/gui/editors/sellableeditor.py:324
+#: ../stoqlib/gui/editors/sellableeditor.py:241
+msgid "Do you really want to delete?"
+msgstr "Você realmente deseja apagar este registro?"
+
+#: ../stoqlib/gui/editors/sellableeditor.py:242
+#: ../stoqlib/gui/editors/parameterseditor.py:108
+#: ../stoqlib/gui/search/parametersearch.py:92
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
+#: ../stoqlib/gui/wizards/personwizard.py:97
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:392
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:498
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:537
+#: ../stoqlib/gui/dialogs/productstockdetails.py:183
+#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
+msgid "Yes"
+msgstr "Sim"
+
+#: ../stoqlib/gui/editors/sellableeditor.py:242
+#: ../stoqlib/gui/editors/parameterseditor.py:114
+#: ../stoqlib/gui/search/parametersearch.py:92
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:392
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:498
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:537
+#: ../stoqlib/gui/dialogs/productstockdetails.py:183
+#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
+msgid "No"
+msgstr "Não"
+
+#: ../stoqlib/gui/editors/sellableeditor.py:337
msgid "No unit"
msgstr "Sem unidade"
-#: ../stoqlib/gui/editors/sellableeditor.py:327
+#: ../stoqlib/gui/editors/sellableeditor.py:340
msgid "Specify:"
msgstr "Especifique:"
-#: ../stoqlib/gui/editors/sellableeditor.py:385
+#: ../stoqlib/gui/editors/sellableeditor.py:398
msgid "The code can not be empty."
msgstr "O código não pode ser vazio."
-#: ../stoqlib/gui/editors/sellableeditor.py:387
+#: ../stoqlib/gui/editors/sellableeditor.py:400
#, python-format
msgid "The code %s already exists."
msgstr "O código %s já existe!"
-#: ../stoqlib/gui/editors/sellableeditor.py:393
+#: ../stoqlib/gui/editors/sellableeditor.py:406
msgid "Barcode must have 14 digits or less."
msgstr "O código de barras deve ter 14 dígitos ou menos."
-#: ../stoqlib/gui/editors/sellableeditor.py:395
+#: ../stoqlib/gui/editors/sellableeditor.py:408
#, python-format
msgid "The barcode %s already exists"
msgstr "O código de barras %s já existe!"
-#: ../stoqlib/gui/editors/sellableeditor.py:399
+#: ../stoqlib/gui/editors/sellableeditor.py:412
msgid "Price cannot be zero or negative"
msgstr "Preço não pode ser zero ou negativo."
-#: ../stoqlib/gui/editors/sellableeditor.py:403
+#: ../stoqlib/gui/editors/sellableeditor.py:416
msgid "Cost cannot be zero or negative"
msgstr "Custo não pode ser zero ou negativo."
-#: ../stoqlib/gui/editors/sellableeditor.py:408
+#: ../stoqlib/gui/editors/sellableeditor.py:421
msgid "Unit must have a description"
msgstr "Unidade de possuir uma descrição"
@@ -2920,7 +2846,7 @@
msgstr "Serviço"
#: ../stoqlib/gui/editors/serviceeditor.py:78
-#: ../stoqlib/gui/wizards/purchasewizard.py:495
+#: ../stoqlib/gui/wizards/purchasewizard.py:505
msgid "Expected receival date must be set to a future date"
msgstr "A data prevista para recebimento deve ser uma data futura"
@@ -2933,29 +2859,6 @@
msgid "Cat 52 directory selection"
msgstr "Selectione o diretório"
-#: ../stoqlib/gui/editors/parameterseditor.py:108
-#: ../stoqlib/gui/search/parametersearch.py:92
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
-#: ../stoqlib/gui/wizards/personwizard.py:97
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:390
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:495
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:534
-#: ../stoqlib/gui/dialogs/productstockdetails.py:183
-#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
-msgid "Yes"
-msgstr "Sim"
-
-#: ../stoqlib/gui/editors/parameterseditor.py:114
-#: ../stoqlib/gui/search/parametersearch.py:92
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:390
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:495
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:534
-#: ../stoqlib/gui/dialogs/productstockdetails.py:183
-#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
-msgid "No"
-msgstr "Não"
-
#: ../stoqlib/gui/editors/parameterseditor.py:128
#, python-format
msgid "Edit '%s' Parameter"
@@ -3097,9 +3000,8 @@
msgstr "A quantidade do componente deve ser maior que zero."
#: ../stoqlib/gui/editors/producteditor.py:458
-#: ../stoqlib/gui/editors/producteditor.py:508
-#: ../stoqlib/gui/editors/producteditor.py:518
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:247
+#: ../stoqlib/gui/editors/producteditor.py:509
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:248
#: ../data/glade/SellableTypeStep.glade.h:2
#: ../data/glade/SellableEditor.glade.h:10
msgid "Product"
@@ -3175,7 +3077,7 @@
#: ../stoqlib/gui/dialogs/devices.py:54 ../stoqlib/domain/station.py:102
#: ../stoqlib/domain/devices.py:155 ../stoqlib/domain/person.py:373
#: ../stoqlib/domain/person.py:590 ../stoqlib/domain/person.py:668
-#: ../stoqlib/domain/person.py:700 ../stoqlib/domain/person.py:1059
+#: ../stoqlib/domain/person.py:700 ../stoqlib/domain/person.py:1060
#: ../stoqlib/domain/test/test_person.py:510
#: ../stoqlib/domain/test/test_person.py:519
#: ../stoqlib/domain/payment/method.py:147
@@ -3187,52 +3089,52 @@
msgid "Active"
msgstr "Ativo"
-#: ../stoqlib/gui/search/servicesearch.py:48
+#: ../stoqlib/gui/search/servicesearch.py:49
msgid "Service Search"
msgstr "Pesquisa de Serviço"
-#: ../stoqlib/gui/search/servicesearch.py:54
+#: ../stoqlib/gui/search/servicesearch.py:55
msgid "Add services"
msgstr "Adicionar serviços"
-#: ../stoqlib/gui/search/servicesearch.py:55
+#: ../stoqlib/gui/search/servicesearch.py:56
msgid "service"
msgstr "serviço"
-#: ../stoqlib/gui/search/servicesearch.py:67
+#: ../stoqlib/gui/search/servicesearch.py:68
#: ../stoqlib/gui/search/personsearch.py:311
-#: ../stoqlib/gui/search/productsearch.py:89
+#: ../stoqlib/gui/search/productsearch.py:90
msgid "matching"
msgstr "contendo"
-#: ../stoqlib/gui/search/servicesearch.py:73
-#: ../stoqlib/gui/search/productsearch.py:97
+#: ../stoqlib/gui/search/servicesearch.py:74
+#: ../stoqlib/gui/search/productsearch.py:98
msgid "_Table of Price"
msgstr "_Tabela de Preço"
#. if not items:
#. raise ValueError('You should have at least one branch at '
#. 'this point')
-#: ../stoqlib/gui/search/servicesearch.py:90
+#: ../stoqlib/gui/search/servicesearch.py:91
#: ../stoqlib/gui/search/personsearch.py:91
#: ../stoqlib/gui/search/personsearch.py:97
#: ../stoqlib/gui/search/personsearch.py:223
#: ../stoqlib/gui/search/personsearch.py:262
#: ../stoqlib/gui/search/personsearch.py:322
-#: ../stoqlib/gui/search/productsearch.py:134
+#: ../stoqlib/gui/search/productsearch.py:135
#: ../stoqlib/gui/search/salesearch.py:62
#: ../stoqlib/gui/search/tillsearch.py:105
-#: ../stoqlib/gui/search/paymentsearch.py:55 ../stoqlib/gui/base/search.py:300
+#: ../stoqlib/gui/search/paymentsearch.py:55 ../stoqlib/gui/base/search.py:350
msgid "Any"
msgstr "Qualquer"
-#: ../stoqlib/gui/search/servicesearch.py:91
+#: ../stoqlib/gui/search/servicesearch.py:92
msgid "Show services with status"
msgstr "Exibir serviços com situação"
-#: ../stoqlib/gui/search/servicesearch.py:108
-#: ../stoqlib/gui/search/productsearch.py:150
-#: ../stoqlib/gui/search/sellablesearch.py:120
+#: ../stoqlib/gui/search/servicesearch.py:109
+#: ../stoqlib/gui/search/productsearch.py:152
+#: ../stoqlib/gui/search/sellablesearch.py:122
msgid "Barcode"
msgstr "Código de Barra"
@@ -3279,6 +3181,22 @@
msgid "Registry Number"
msgstr "Número de Registro"
+#: ../stoqlib/gui/search/personsearch.py:116
+#: ../stoqlib/gui/search/personsearch.py:336
+#: ../stoqlib/gui/search/paymentsearch.py:82
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:133
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:92
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:131
+#: ../stoqlib/gui/dialogs/saledetails.py:152
+#: ../stoqlib/gui/dialogs/clientdetails.py:129
+#: ../stoqlib/gui/dialogs/clientdetails.py:164
+#: ../stoqlib/gui/dialogs/supplierdetails.py:123
+#: ../stoqlib/gui/dialogs/supplierdetails.py:149
+#: ../stoqlib/gui/dialogs/purchasedetails.py:177
+#: ../stoqlib/domain/payment/views.py:262
+msgid "Status"
+msgstr "Situação"
+
#: ../stoqlib/gui/search/personsearch.py:125
msgid "Supplier Search"
msgstr "Pesquisa de Fornecedor"
@@ -3369,7 +3287,7 @@
#: ../stoqlib/domain/devices.py:156 ../stoqlib/domain/person.py:374
#: ../stoqlib/domain/person.py:499 ../stoqlib/domain/person.py:591
#: ../stoqlib/domain/person.py:669 ../stoqlib/domain/person.py:701
-#: ../stoqlib/domain/person.py:1061 ../stoqlib/domain/test/test_person.py:462
+#: ../stoqlib/domain/person.py:1062 ../stoqlib/domain/test/test_person.py:462
#: ../stoqlib/domain/test/test_person.py:473
#: ../stoqlib/domain/payment/method.py:148 ../plugins/ecf/ecfdomain.py:205
#: ../data/glade/BranchDetailsSlave.glade.h:3
@@ -3478,15 +3396,30 @@
msgid "ISS Total:"
msgstr "ISS Total:"
+#: ../stoqlib/gui/search/fiscalsearch.py:123
+#: ../stoqlib/gui/search/commissionsearch.py:81
+#: ../stoqlib/gui/search/tillsearch.py:116
+#: ../stoqlib/gui/dialogs/tillhistory.py:63
+#: ../stoqlib/gui/dialogs/clientdetails.py:125
+#: ../stoqlib/gui/dialogs/supplierdetails.py:121
+#: ../stoqlib/gui/dialogs/productstockdetails.py:129
+#: ../data/glade/FiscalMemoryEditor.glade.h:2
+msgid "Date"
+msgstr "Data"
+
#: ../stoqlib/gui/search/fiscalsearch.py:125
#: ../stoqlib/gui/dialogs/productstockdetails.py:135
msgid "Invoice"
msgstr "Nota Fiscal"
+#: ../stoqlib/gui/search/fiscalsearch.py:128
+msgid "Drawee"
+msgstr "Sacado/Fornecedor"
+
#. Branch
#: ../stoqlib/gui/search/fiscalsearch.py:151
-#: ../stoqlib/gui/search/productsearch.py:127
-#: ../stoqlib/gui/search/productsearch.py:216
+#: ../stoqlib/gui/search/productsearch.py:128
+#: ../stoqlib/gui/search/productsearch.py:218
#: ../stoqlib/gui/search/purchasesearch.py:63
msgid "In branch:"
msgstr "Na unidade"
@@ -3569,8 +3502,8 @@
#. Date
#: ../stoqlib/gui/search/transfersearch.py:85
-#: ../stoqlib/gui/search/productsearch.py:211
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:341
+#: ../stoqlib/gui/search/productsearch.py:213
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:343
#: ../stoqlib/gui/dialogs/tillhistory.py:75
#: ../data/glade/EmployeeDetailsSlave.glade.h:7
#: ../data/glade/ProductsAdjustment.glade.h:3
@@ -3580,7 +3513,7 @@
msgstr "Data:"
#: ../stoqlib/gui/search/transfersearch.py:90
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:354
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:356
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:144
msgid "Open Date"
msgstr "Abertura"
@@ -3598,37 +3531,37 @@
msgid "Number of items transferred"
msgstr "Transferidos"
-#: ../stoqlib/gui/search/productsearch.py:57
+#: ../stoqlib/gui/search/productsearch.py:58
msgid "Product Search"
msgstr "Pesquisa de Produtos"
-#: ../stoqlib/gui/search/productsearch.py:62
+#: ../stoqlib/gui/search/productsearch.py:63
msgid "Add products"
msgstr "Adicionar produtos"
-#: ../stoqlib/gui/search/productsearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:249
+#: ../stoqlib/gui/search/productsearch.py:64
+#: ../stoqlib/gui/search/productsearch.py:251
msgid "product"
msgstr "produto"
-#: ../stoqlib/gui/search/productsearch.py:135
+#: ../stoqlib/gui/search/productsearch.py:136
msgid "with status:"
msgstr "Com situação:"
-#: ../stoqlib/gui/search/productsearch.py:156
-#: ../stoqlib/gui/search/productsearch.py:277
+#: ../stoqlib/gui/search/productsearch.py:158
+#: ../stoqlib/gui/search/productsearch.py:279
msgid "Location"
msgstr "Localização"
-#: ../stoqlib/gui/search/productsearch.py:194
+#: ../stoqlib/gui/search/productsearch.py:196
msgid "Product History Search"
msgstr "Pesquisa de Histórico de Produtos"
-#: ../stoqlib/gui/search/productsearch.py:244
+#: ../stoqlib/gui/search/productsearch.py:246
msgid "Product Stock Search"
msgstr "Pesquisa Estoque de Produtos"
-#: ../stoqlib/gui/search/productsearch.py:288
+#: ../stoqlib/gui/search/productsearch.py:290
msgid "Difference"
msgstr "Diferença"
@@ -3640,18 +3573,52 @@
msgid "Show sales with status"
msgstr "Exibir vendas com situação"
+#: ../stoqlib/gui/search/salesearch.py:68
+#: ../stoqlib/gui/search/paymentsearch.py:76
+#: ../stoqlib/gui/wizards/receivingwizard.py:97
+#: ../stoqlib/gui/dialogs/tillhistory.py:61
+msgid "Number"
+msgstr "Número"
+
#: ../stoqlib/gui/search/salesearch.py:70
-#: ../stoqlib/gui/wizards/receivingwizard.py:98
+#: ../stoqlib/gui/wizards/receivingwizard.py:99
#: ../stoqlib/gui/dialogs/productstockdetails.py:146
msgid "Date Started"
msgstr "Abertura"
+#: ../stoqlib/gui/search/salesearch.py:75
+#: ../stoqlib/gui/search/commissionsearch.py:71
+#: ../stoqlib/gui/dialogs/clientdetails.py:127
+msgid "Salesperson"
+msgstr "Vendedor"
+
#: ../stoqlib/gui/search/salesearch.py:77
-#: ../data/glade/SaleDetailsDialog.glade.h:6
+#: ../data/glade/SaleDetailsDialog.glade.h:7
#: ../data/glade/RenegotiationDetailsDialog.glade.h:6
msgid "Items"
msgstr "Itens"
+#: ../stoqlib/gui/search/salesearch.py:115
+msgid "Delivery Search"
+msgstr "Pesquisa de Serviço"
+
+#: ../stoqlib/gui/search/salesearch.py:122
+msgid "Items matching:"
+msgstr "Itens encontrados:"
+
+#: ../stoqlib/gui/search/salesearch.py:125
+#: ../stoqlib/gui/search/purchasesearch.py:76
+msgid "# "
+msgstr "# "
+
+#: ../stoqlib/gui/search/salesearch.py:132
+msgid "Estimated Date"
+msgstr "Data Estimada"
+
+#: ../stoqlib/gui/search/salesearch.py:134
+msgid "Completion Date"
+msgstr "Data de Conclusão"
+
#: ../stoqlib/gui/search/commissionsearch.py:46
msgid "Search for Commissions"
msgstr "Procurar por Comissões"
@@ -3702,14 +3669,14 @@
msgid "Receival Date"
msgstr "Recebido em"
+#: ../stoqlib/gui/search/receivingsearch.py:83
+msgid "Invoice #"
+msgstr "N.F. #"
+
#: ../stoqlib/gui/search/purchasesearch.py:43
msgid "Purchased Items Search"
msgstr "Pesquisa de Itens Comprados"
-#: ../stoqlib/gui/search/purchasesearch.py:76
-msgid "# "
-msgstr "# "
-
#: ../stoqlib/gui/search/purchasesearch.py:80
msgid "Purchased"
msgstr "Comprado"
@@ -3722,23 +3689,23 @@
msgid "Expected receival"
msgstr "Previsão de recebimento"
-#: ../stoqlib/gui/search/sellablesearch.py:50
+#: ../stoqlib/gui/search/sellablesearch.py:51
msgid "Search for sale items"
msgstr "Pesquisa de itens à venda"
-#: ../stoqlib/gui/search/sellablesearch.py:55
+#: ../stoqlib/gui/search/sellablesearch.py:56
msgid "_Add sale items"
msgstr "_Adicionar Itens à venda"
-#: ../stoqlib/gui/search/sellablesearch.py:56
+#: ../stoqlib/gui/search/sellablesearch.py:57
msgid "sale item"
msgstr "item"
-#: ../stoqlib/gui/search/sellablesearch.py:56
+#: ../stoqlib/gui/search/sellablesearch.py:57
msgid "sale items"
msgstr "itens"
-#: ../stoqlib/gui/search/sellablesearch.py:84
+#: ../stoqlib/gui/search/sellablesearch.py:85
msgid "Show items matching:"
msgstr "Exibir itens encontrados:"
@@ -3763,7 +3730,7 @@
msgstr "Parâmetros de Sistema do Stoq"
#: ../stoqlib/gui/search/parametersearch.py:68
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:350
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:352
msgid "Group"
msgstr "Grupo"
@@ -3783,18 +3750,26 @@
msgid "Bill or check number:"
msgstr "Número do boleto ou cheque:"
+#: ../stoqlib/gui/search/paymentsearch.py:70
+msgid "Bank"
+msgstr "Banco"
+
#: ../stoqlib/gui/search/paymentsearch.py:72
msgid "Branch Number"
msgstr "Agência:"
+#: ../stoqlib/gui/search/paymentsearch.py:74
+msgid "Account"
+msgstr "Conta"
+
#: ../stoqlib/gui/search/paymentsearch.py:78
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:128
#: ../stoqlib/gui/wizards/renegotiationwizard.py:90
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:126
-#: ../stoqlib/gui/dialogs/saledetails.py:154
+#: ../stoqlib/gui/dialogs/saledetails.py:147
#: ../stoqlib/gui/dialogs/clientdetails.py:162
#: ../stoqlib/gui/dialogs/supplierdetails.py:147
-#: ../stoqlib/gui/dialogs/purchasedetails.py:189
+#: ../stoqlib/gui/dialogs/purchasedetails.py:172
#: ../stoqlib/gui/slaves/paymentslave.py:1038
#: ../stoqlib/domain/payment/views.py:260
msgid "Due Date"
@@ -3803,8 +3778,8 @@
#: ../stoqlib/gui/search/paymentsearch.py:80
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:131
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:129
-#: ../stoqlib/gui/dialogs/saledetails.py:157
-#: ../stoqlib/gui/dialogs/purchasedetails.py:192
+#: ../stoqlib/gui/dialogs/saledetails.py:150
+#: ../stoqlib/gui/dialogs/purchasedetails.py:175
msgid "Paid Date"
msgstr "Pagamento"
@@ -3823,8 +3798,8 @@
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:138
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:136
-#: ../stoqlib/gui/dialogs/saledetails.py:164
-#: ../stoqlib/gui/dialogs/purchasedetails.py:200
+#: ../stoqlib/gui/dialogs/saledetails.py:157
+#: ../stoqlib/gui/dialogs/purchasedetails.py:183
msgid "Paid Value"
msgstr "Valor Pago"
@@ -3855,12 +3830,6 @@
msgid "Client %s does not have enought credit left."
msgstr "Cliente %s excedeu o limite de crédito."
-#: ../stoqlib/gui/wizards/salewizard.py:359
-#: ../stoqlib/gui/wizards/salequotewizard.py:128
-#: ../stoqlib/gui/slaves/receivingslave.py:119
-msgid "Additional Information"
-msgstr "Informação Adicional"
-
#: ../stoqlib/gui/wizards/salewizard.py:371
msgid "Sale Checkout"
msgstr "Confirmação de Venda"
@@ -3895,7 +3864,7 @@
msgstr "A data a expirar deve ser a data atual ou uma data futura."
#: ../stoqlib/gui/wizards/salequotewizard.py:135
-#: ../stoqlib/gui/wizards/purchasewizard.py:175
+#: ../stoqlib/gui/wizards/purchasewizard.py:181
msgid "Total Ordered:"
msgstr "Total Pedido:"
@@ -3915,44 +3884,48 @@
msgid "Expected receival date must be set to today or a future date"
msgstr "A data prevista para recebimento deve ser a data atual uma data futura"
-#: ../stoqlib/gui/wizards/purchasewizard.py:241
-#: ../stoqlib/gui/wizards/receivingwizard.py:101
+#: ../stoqlib/gui/wizards/purchasewizard.py:173
+msgid "The expected freight value must be a positive number."
+msgstr "O valor esperado de frete deve ser um número positivo."
+
+#: ../stoqlib/gui/wizards/purchasewizard.py:247
+#: ../stoqlib/gui/wizards/receivingwizard.py:102
msgid "Expected Receival"
msgstr "Previsão de recebimento"
-#: ../stoqlib/gui/wizards/purchasewizard.py:303
+#: ../stoqlib/gui/wizards/purchasewizard.py:309
msgid "The cost must be greater than zero."
msgstr "O valor deve ser maior que zero."
-#: ../stoqlib/gui/wizards/purchasewizard.py:307
+#: ../stoqlib/gui/wizards/purchasewizard.py:313
msgid "Quantity must be greater than zero"
msgstr "Quantidade deve ser maior que zero"
-#: ../stoqlib/gui/wizards/purchasewizard.py:311
+#: ../stoqlib/gui/wizards/purchasewizard.py:317
msgid "Quantity below the minimum required by the supplier"
msgstr "Quantidade abaixo do mínimo requirido pelo fornecedor"
-#: ../stoqlib/gui/wizards/purchasewizard.py:332
+#: ../stoqlib/gui/wizards/purchasewizard.py:338
#: ../stoqlib/domain/payment/operation.py:115
msgid "Bill"
msgstr "Boleto"
-#: ../stoqlib/gui/wizards/purchasewizard.py:333
+#: ../stoqlib/gui/wizards/purchasewizard.py:339
#: ../stoqlib/domain/payment/operation.py:73
msgid "Check"
msgstr "Cheque"
-#: ../stoqlib/gui/wizards/purchasewizard.py:334
+#: ../stoqlib/gui/wizards/purchasewizard.py:340
#: ../stoqlib/domain/payment/operation.py:50
#: ../data/glade/BasePaymentAddition.glade.h:4
msgid "Money"
msgstr "Dinheiro"
-#: ../stoqlib/gui/wizards/purchasewizard.py:541
+#: ../stoqlib/gui/wizards/purchasewizard.py:551
msgid "New Order"
msgstr "Novo Pedido"
-#: ../stoqlib/gui/wizards/purchasewizard.py:542
+#: ../stoqlib/gui/wizards/purchasewizard.py:552
msgid "Edit Order"
msgstr "Editar o Pedido"
@@ -3980,32 +3953,32 @@
msgid "Adding a %s"
msgstr "Adicionando %s"
-#: ../stoqlib/gui/wizards/receivingwizard.py:105
+#: ../stoqlib/gui/wizards/receivingwizard.py:106
msgid "Qty Ordered"
msgstr "Pedido"
-#: ../stoqlib/gui/wizards/receivingwizard.py:111
+#: ../stoqlib/gui/wizards/receivingwizard.py:112
msgid "Order Total"
msgstr "Total"
-#: ../stoqlib/gui/wizards/receivingwizard.py:203
+#: ../stoqlib/gui/wizards/receivingwizard.py:205
#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:4
msgid "Total Received:"
msgstr "Total Recebido:"
-#: ../stoqlib/gui/wizards/receivingwizard.py:247
+#: ../stoqlib/gui/wizards/receivingwizard.py:249
msgid "Quantity to receive"
msgstr "A receber"
-#: ../stoqlib/gui/wizards/receivingwizard.py:291
+#: ../stoqlib/gui/wizards/receivingwizard.py:299
msgid "Receiving Order"
msgstr "Recebimento de Compra"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:110
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:111
msgid "The quote deadline date must be set to today or a future date"
msgstr "O prazo para cotação deve ser a data atual ou uma data futura"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:177
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:178
msgid ""
"No supplier have been found for any of the selected items.\n"
"This quote will be cancelled."
@@ -4013,38 +3986,38 @@
"Nenhum fornecedor foi encontrado para qualquer um dos itens selecionados.\n"
"Esta cotação será cancelada."
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:185
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:186
msgid "Supplied/Total"
msgstr "Fornecido/Total"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:215
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:216
#, python-format
msgid "%s/%s"
msgstr "%s/%s"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:253
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:254
#, python-format
msgid "Products supplied by %s"
msgstr "Produtos fornecidos por %s"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:267
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:268
msgid "Missing Products"
msgstr "Produtos não cotados"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:348
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:350
msgid "Quote"
msgstr "Cotação"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:356
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:358
msgid "Deadline"
msgstr "Prazo"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:389
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:391
#, python-format
msgid "Are you sure you want to remove \"%s\" ?"
msgstr "Tem certeza que deseja remover \"%s\" ?"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:493
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:496
msgid ""
"Are you sure you want to cancel this group ? If so, note that all the quotes "
"will be cancelled."
@@ -4052,19 +4025,19 @@
"Tem certeza que deseja cancelar este grupo ? Se sim, note que todas as "
"cotações serão canceladas."
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:532
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:535
msgid "Should we close the quotes used to compose the purchase order ?"
msgstr "Deseja fechar as cotações utilizadas para compor uma ordem de compra ?"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:612
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:615
msgid "New Quote"
msgstr "Nova Cotação"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:613
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:616
msgid "Edit Quote"
msgstr "Editar Cotação"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:652
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:655
msgid "Receive Quote Wizard"
msgstr "Recebimento de Cotação"
@@ -4120,8 +4093,8 @@
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:52
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:212
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:151
-#: ../stoqlib/gui/dialogs/saledetails.py:183
-#: ../stoqlib/gui/dialogs/purchasedetails.py:209
+#: ../stoqlib/gui/dialogs/saledetails.py:176
+#: ../stoqlib/gui/dialogs/purchasedetails.py:192
#: ../stoqlib/gui/slaves/paymentslave.py:903 ../plugins/ecf/ecfdomain.py:250
msgid "Payment"
msgstr "Pagamento"
@@ -4141,37 +4114,37 @@
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:210
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:149
-#: ../stoqlib/gui/dialogs/saledetails.py:181
-#: ../stoqlib/gui/dialogs/purchasedetails.py:207
+#: ../stoqlib/gui/dialogs/saledetails.py:174
+#: ../stoqlib/gui/dialogs/purchasedetails.py:190
#: ../stoqlib/gui/dialogs/productstockdetails.py:174
msgid "When"
msgstr "Quando"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:215
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:154
-#: ../stoqlib/gui/dialogs/saledetails.py:186
-#: ../stoqlib/gui/dialogs/purchasedetails.py:212
+#: ../stoqlib/gui/dialogs/saledetails.py:179
+#: ../stoqlib/gui/dialogs/purchasedetails.py:195
msgid "Changed"
msgstr "Alterado"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:217
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:156
-#: ../stoqlib/gui/dialogs/saledetails.py:188
-#: ../stoqlib/gui/dialogs/purchasedetails.py:214
+#: ../stoqlib/gui/dialogs/saledetails.py:181
+#: ../stoqlib/gui/dialogs/purchasedetails.py:197
msgid "From"
msgstr "De"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:219
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:158
-#: ../stoqlib/gui/dialogs/saledetails.py:190
-#: ../stoqlib/gui/dialogs/purchasedetails.py:216
+#: ../stoqlib/gui/dialogs/saledetails.py:183
+#: ../stoqlib/gui/dialogs/purchasedetails.py:199
msgid "To"
msgstr "Até"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:221
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:160
-#: ../stoqlib/gui/dialogs/saledetails.py:192
-#: ../stoqlib/gui/dialogs/purchasedetails.py:218
+#: ../stoqlib/gui/dialogs/saledetails.py:185
+#: ../stoqlib/gui/dialogs/purchasedetails.py:201
#: ../stoqlib/gui/dialogs/productstockdetails.py:176
msgid "Reason"
msgstr "Razão"
@@ -4185,15 +4158,15 @@
msgid "Payment Details"
msgstr "Detalhes de Pagamento"
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:42
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:44
msgid "CSV Exporter Dialog"
msgstr "Dialogo de exportação CSV"
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:90
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:92
msgid "Export CSV..."
msgstr "Exportar CSV..."
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:97
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:99
msgid "CSV Files"
msgstr "Arquivos CSV"
@@ -4376,7 +4349,7 @@
msgstr "Detalhes de Renegociação"
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:122
-#: ../stoqlib/gui/dialogs/saledetails.py:150
+#: ../stoqlib/gui/dialogs/saledetails.py:143
#: ../stoqlib/gui/dialogs/clientdetails.py:157
#: ../stoqlib/gui/dialogs/supplierdetails.py:142
msgid "Type"
@@ -4417,7 +4390,7 @@
msgid "Sale Details"
msgstr "Detalhes da Venda"
-#: ../stoqlib/gui/dialogs/saledetails.py:232
+#: ../stoqlib/gui/dialogs/saledetails.py:227
msgid "Sale Cancellation Details"
msgstr "Detalhes do cancelamento da venda"
@@ -4476,7 +4449,7 @@
msgid "Purchase Details"
msgstr "Detalhes do Pedido"
-#: ../stoqlib/gui/dialogs/purchasedetails.py:174
+#: ../stoqlib/gui/dialogs/purchasedetails.py:157
msgid "Quantity Received"
msgstr "Recebido"
@@ -4504,31 +4477,31 @@
msgid "Notification"
msgstr "Notificação"
-#: ../stoqlib/gui/base/search.py:157
+#: ../stoqlib/gui/base/search.py:204
msgid "Se_lect Items"
msgstr "S_elecione Itens"
-#: ../stoqlib/gui/base/search.py:607
+#: ../stoqlib/gui/base/search.py:657
msgid "This week"
msgstr "Esta semana"
-#: ../stoqlib/gui/base/search.py:619
+#: ../stoqlib/gui/base/search.py:669
msgid "Last Week"
msgstr "Semana passada"
-#: ../stoqlib/gui/base/search.py:631
+#: ../stoqlib/gui/base/search.py:681
msgid "Next week"
msgstr "Próxima semana"
-#: ../stoqlib/gui/base/search.py:642
+#: ../stoqlib/gui/base/search.py:692
msgid "This month"
msgstr "Este mês"
-#: ../stoqlib/gui/base/search.py:652
+#: ../stoqlib/gui/base/search.py:702
msgid "Last month"
msgstr "Mês passado"
-#: ../stoqlib/gui/base/search.py:662
+#: ../stoqlib/gui/base/search.py:712
msgid "Next month"
msgstr "Próximo mês"
@@ -4573,19 +4546,19 @@
msgid "Sale price can not be 0"
msgstr "Preço de venda não pode ser 0"
-#: ../stoqlib/gui/slaves/productslave.py:85
+#: ../stoqlib/gui/slaves/productslave.py:82
msgid "Minimum value must be a positive value."
msgstr "Mínimo deve ser um valor positivo."
-#: ../stoqlib/gui/slaves/productslave.py:89
+#: ../stoqlib/gui/slaves/productslave.py:86
msgid "Minimum must be lower than the maximum value."
msgstr "Mínimo deve ser menor que o valor máximo."
-#: ../stoqlib/gui/slaves/productslave.py:96
+#: ../stoqlib/gui/slaves/productslave.py:93
msgid "Maximum value must be a positive value."
msgstr "Máximo deve ser um valor positivo."
-#: ../stoqlib/gui/slaves/productslave.py:100
+#: ../stoqlib/gui/slaves/productslave.py:97
msgid "Maximum must be greater than the minimum value."
msgstr "Máximo deve ser maior que o valor mínimo."
@@ -4605,63 +4578,67 @@
msgid "Select Image"
msgstr "Selecione Imagem"
-#: ../stoqlib/gui/slaves/receivingslave.py:123
+#: ../stoqlib/gui/slaves/receivingslave.py:129
msgid "Receving order number must be between 1 and 999999"
msgstr "O número da nota fiscal deve estar entre 1 e 999999"
-#: ../stoqlib/gui/slaves/receivingslave.py:131
+#: ../stoqlib/gui/slaves/receivingslave.py:137
#, python-format
msgid "Invoice %d already exists for supplier %s."
msgstr "A Nota Fiscal %d já existe para o fornecedor %s."
-#: ../stoqlib/gui/slaves/receivingslave.py:136
+#: ../stoqlib/gui/slaves/receivingslave.py:142
msgid "This field cannot be negative"
msgstr "Este campo não pode ser negativo."
-#: ../stoqlib/gui/slaves/receivingslave.py:176
+#: ../stoqlib/gui/slaves/receivingslave.py:182
msgid "Discount must be greater than zero"
msgstr "O desconto deve ser maior que zero"
-#: ../stoqlib/gui/slaves/receivingslave.py:178
+#: ../stoqlib/gui/slaves/receivingslave.py:184
#, python-format
msgid "Discount must be less than %s"
msgstr "O desconto deve ser menor que %s"
-#: ../stoqlib/gui/slaves/installmentslave.py:188
+#: ../stoqlib/gui/slaves/installmentslave.py:204
msgid "Confirm payment"
msgstr "Confirmar Pagamento"
-#: ../stoqlib/gui/slaves/installmentslave.py:229
+#: ../stoqlib/gui/slaves/installmentslave.py:245
msgid "Due"
msgstr "Vencimento"
-#: ../stoqlib/gui/slaves/installmentslave.py:232
+#: ../stoqlib/gui/slaves/installmentslave.py:246
+msgid "Paid date"
+msgstr "Pagamento"
+
+#: ../stoqlib/gui/slaves/installmentslave.py:248
msgid "Paid value"
msgstr "Valor Pago"
-#: ../stoqlib/gui/slaves/installmentslave.py:287
+#: ../stoqlib/gui/slaves/installmentslave.py:309
#, python-format
msgid "Paid date must be between %s and today"
msgstr "Pagamento deve estar entre %s e hoje"
-#: ../stoqlib/gui/slaves/installmentslave.py:297
+#: ../stoqlib/gui/slaves/installmentslave.py:319
msgid "Penalty can not be less than zero"
msgstr "Juro não pode ser menor que zero"
-#: ../stoqlib/gui/slaves/installmentslave.py:306
+#: ../stoqlib/gui/slaves/installmentslave.py:328
msgid "Interest can not be less than zero"
msgstr "Multa não pode ser menor que zero"
-#: ../stoqlib/gui/slaves/installmentslave.py:316
+#: ../stoqlib/gui/slaves/installmentslave.py:338
#, python-format
msgid "Discount can not be greater or equal than %.2f"
msgstr "Desconto não pode ser maior do que o valor %.2f"
-#: ../stoqlib/gui/slaves/installmentslave.py:319
+#: ../stoqlib/gui/slaves/installmentslave.py:341
msgid "Discount can not be less than zero"
msgstr "Desconto não pode ser menor que zero"
-#: ../stoqlib/gui/slaves/installmentslave.py:368
+#: ../stoqlib/gui/slaves/installmentslave.py:390
msgid "Supplier: "
msgstr "Fornecedor:"
@@ -4932,11 +4909,16 @@
msgstr "Pendente"
#: ../stoqlib/domain/transfer.py:80 ../stoqlib/domain/purchase.py:145
-#: ../stoqlib/domain/sellable.py:251 ../stoqlib/domain/till.py:88
+#: ../stoqlib/domain/sellable.py:249 ../stoqlib/domain/till.py:88
#: ../stoqlib/domain/inventory.py:168 ../stoqlib/domain/payment/group.py:62
msgid "Closed"
msgstr "Fechado"
+#: ../stoqlib/domain/receiving.py:214
+#, python-format
+msgid "Freight for purchase %s"
+msgstr "Frete para compras %s"
+
#: ../stoqlib/domain/devices.py:66
msgid "Serial port 1"
msgstr "Porta serial 1"
@@ -4961,80 +4943,100 @@
msgid "Day"
msgstr "Dias"
-#: ../stoqlib/domain/purchase.py:141 ../stoqlib/domain/sale.py:277
-#: ../stoqlib/domain/inventory.py:169 ../stoqlib/domain/payment/payment.py:77
+#: ../stoqlib/domain/purchase.py:141 ../stoqlib/domain/sale.py:279
+#: ../stoqlib/domain/inventory.py:169 ../stoqlib/domain/payment/payment.py:79
#: ../stoqlib/domain/payment/group.py:63
msgid "Cancelled"
msgstr "Cancelado"
-#: ../stoqlib/domain/purchase.py:142 ../stoqlib/domain/sale.py:281
+#: ../stoqlib/domain/purchase.py:142 ../stoqlib/domain/sale.py:283
msgid "Quoting"
msgstr "Cotação"
-#: ../stoqlib/domain/purchase.py:144 ../stoqlib/domain/sale.py:275
-#: ../stoqlib/domain/payment/payment.py:76
+#: ../stoqlib/domain/purchase.py:144 ../stoqlib/domain/sale.py:277
+#: ../stoqlib/domain/payment/payment.py:78
#: ../stoqlib/domain/payment/renegotiation.py:55
#: ../stoqlib/domain/payment/group.py:61
msgid "Confirmed"
msgstr "Confirmado"
-#: ../stoqlib/domain/purchase.py:150 ../data/glade/StartPurchaseStep.glade.h:7
+#: ../stoqlib/domain/purchase.py:150 ../data/glade/StartPurchaseStep.glade.h:6
msgid "FOB"
msgstr "FOB"
-#: ../stoqlib/domain/purchase.py:151 ../data/glade/StartPurchaseStep.glade.h:6
+#: ../stoqlib/domain/purchase.py:151 ../data/glade/StartPurchaseStep.glade.h:4
msgid "CIF"
msgstr "CIF"
-#: ../stoqlib/domain/purchase.py:515
+#: ../stoqlib/domain/purchase.py:508
#, python-format
msgid "quote number %04d"
msgstr "Cotação número %04d"
-#: ../stoqlib/domain/purchase.py:569
+#: ../stoqlib/domain/purchase.py:562
#, python-format
msgid "%s Money Returned for Purchase %d"
msgstr "%s Dinheiro Devolvido para compra %d"
-#: ../stoqlib/domain/sale.py:274 ../stoqlib/domain/till.py:87
+#: ../stoqlib/domain/sale.py:276 ../stoqlib/domain/till.py:87
#: ../stoqlib/domain/inventory.py:167
msgid "Opened"
msgstr "Aberto"
-#: ../stoqlib/domain/sale.py:276 ../stoqlib/domain/payment/payment.py:74
+#: ../stoqlib/domain/sale.py:278 ../stoqlib/domain/payment/payment.py:76
#: ../stoqlib/domain/payment/renegotiation.py:56
msgid "Paid"
msgstr "Pago"
-#: ../stoqlib/domain/sale.py:279
+#: ../stoqlib/domain/sale.py:281
msgid "Returned"
msgstr "Devolvido"
-#: ../stoqlib/domain/sale.py:280 ../stoqlib/domain/payment/renegotiation.py:57
+#: ../stoqlib/domain/sale.py:282 ../stoqlib/domain/payment/renegotiation.py:57
msgid "Renegotiated"
msgstr "Renegociado"
+#: ../stoqlib/domain/sale.py:550
+#, python-format
+msgid "Sale Details: %s"
+msgstr "Detalhes da Venda: %s"
+
+#: ../stoqlib/domain/sale.py:556
+#, python-format
+msgid "Delivery Address: %s"
+msgstr "Endereço de Entrega: %s"
+
+#: ../stoqlib/domain/sale.py:562
+#, python-format
+msgid "\"%s\" Notes: %s"
+msgstr "\"%s\" Notas: %s"
+
+#: ../stoqlib/domain/sale.py:565
+#, python-format
+msgid "\"%s\" Estimated Fix Date: %s"
+msgstr "\"%s\" Data Estimada de Execução: %s"
+
#. The sale was not entirely paid, so we have to payback the
#. till, because the sale amount have already been added in there
-#: ../stoqlib/domain/sale.py:826
+#: ../stoqlib/domain/sale.py:845
#, python-format
msgid "Debit on Till: Sale %d Returned"
msgstr "Débito no caixa: Venda %d devolvida"
-#: ../stoqlib/domain/sale.py:836
+#: ../stoqlib/domain/sale.py:855
#, python-format
msgid "%s Money Returned for Sale %d"
msgstr "%s Dinheiro Devolvido para Venda %d"
-#: ../stoqlib/domain/sellable.py:249
+#: ../stoqlib/domain/sellable.py:247
msgid "Available"
msgstr "Disponível"
-#: ../stoqlib/domain/sellable.py:252 ../stoqlib/domain/person.py:592
+#: ../stoqlib/domain/sellable.py:250 ../stoqlib/domain/person.py:592
msgid "Blocked"
msgstr "Bloqueado"
-#: ../stoqlib/domain/sellable.py:541
+#: ../stoqlib/domain/sellable.py:565
#, python-format
msgid ""
"The sellable with barcode '%s' doesn't exists or is not available to be sold"
@@ -5177,20 +5179,20 @@
msgid "Multiple"
msgstr "Múltiplo"
-#: ../stoqlib/domain/payment/payment.py:72
+#: ../stoqlib/domain/payment/payment.py:74
#: ../stoqlib/domain/payment/group.py:60
msgid "Preview"
msgstr "Avaliação"
-#: ../stoqlib/domain/payment/payment.py:73
+#: ../stoqlib/domain/payment/payment.py:75
msgid "To Pay"
msgstr "A pagar"
-#: ../stoqlib/domain/payment/payment.py:75
+#: ../stoqlib/domain/payment/payment.py:77
msgid "Reviewing"
msgstr "Revisão"
-#: ../stoqlib/domain/payment/payment.py:301
+#: ../stoqlib/domain/payment/payment.py:304
msgid "NOT PAID"
msgstr "A PAGAR"
@@ -5219,17 +5221,17 @@
msgid "%s/%s %s for %s"
msgstr "%s/%s %s referente à %s"
-#: ../stoqlib/domain/payment/group.py:206
+#: ../stoqlib/domain/payment/group.py:212
#, python-format
msgid "sale %s"
msgstr "venda %s"
-#: ../stoqlib/domain/payment/group.py:208
+#: ../stoqlib/domain/payment/group.py:214
#, python-format
msgid "order %s"
msgstr "pedido %s"
-#: ../stoqlib/domain/payment/group.py:210
+#: ../stoqlib/domain/payment/group.py:216
#, python-format
msgid "renegotiation %s"
msgstr "Renegociação %s"
@@ -5449,9 +5451,9 @@
msgstr "Imposto"
#: ../plugins/ecf/deviceconstanteditor.py:205
-#: ../data/glade/SaleDetailsDialog.glade.h:9
+#: ../data/glade/SaleDetailsDialog.glade.h:10
#: ../data/glade/RenegotiationDetailsDialog.glade.h:9
-#: ../data/glade/PurchaseDetailsDialog.glade.h:17
+#: ../data/glade/PurchaseDetailsDialog.glade.h:16
#: ../data/glade/ClientDetailsDialog.glade.h:4
#: ../data/glade/SupplierDetailsDialog.glade.h:3
msgid "Payments"
@@ -5622,8 +5624,6 @@
#: ../data/glade/SaleDiscountSlave.glade.h:2
#: ../data/glade/TributarySituationSlave.glade.h:2
#: ../data/glade/SellablePriceEditor.glade.h:2
-#: ../data/glade/PurchaseDetailsDialog.glade.h:2
-#: ../data/glade/StartPurchaseStep.glade.h:2
#: ../data/glade/PaymentMethodEditor.glade.h:2
#: ../data/glade/ProductSupplierEditor.glade.h:2
#: ../data/glade/SellableCategoryDataSlave.glade.h:2
@@ -5696,7 +5696,6 @@
#: ../data/glade/SalesPersonStep.glade.h:1
#: ../data/glade/ProductAdjustmentDialog.glade.h:1
#: ../data/glade/SellablePriceEditor.glade.h:6
-#: ../data/glade/StartPurchaseStep.glade.h:3
#: ../data/glade/PaymentMethodEditor.glade.h:4
#: ../data/glade/ProductSupplierEditor.glade.h:3
#: ../data/glade/PurchasePaymentStep.glade.h:1
@@ -5715,7 +5714,7 @@
msgstr "Expira"
#: ../data/glade/SalesPersonStep.glade.h:5
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:9
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:12
msgid "Notes..."
msgstr "Notas..."
@@ -5724,13 +5723,13 @@
msgstr "Detalhes do Pedido"
#: ../data/glade/SalesPersonStep.glade.h:7
-#: ../data/glade/SaleDetailsDialog.glade.h:10
+#: ../data/glade/SaleDetailsDialog.glade.h:12
#: ../data/glade/PurchaseDetailsDialog.glade.h:19
msgid "Salesperson:"
msgstr "Vendedor:"
#: ../data/glade/SalesPersonStep.glade.h:8
-#: ../data/glade/SaleDetailsDialog.glade.h:12
+#: ../data/glade/SaleDetailsDialog.glade.h:14
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:4
#: ../data/glade/RenegotiationDetailsDialog.glade.h:12
#: ../data/glade/PurchaseDetailsDialog.glade.h:20
@@ -5744,24 +5743,44 @@
#: ../data/glade/SaleDetailsDialog.glade.h:2
#: ../data/glade/RenegotiationDetailsDialog.glade.h:2
-#: ../data/glade/PurchaseDetailsDialog.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:3
msgid "Changes"
msgstr "Alterações"
-#: ../data/glade/SaleDetailsDialog.glade.h:7
+#: ../data/glade/SaleDetailsDialog.glade.h:6
+#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:8
+#: ../data/glade/PaymentMethodEditor.glade.h:7
+msgid "Interest:"
+msgstr "Multa:"
+
+#: ../data/glade/SaleDetailsDialog.glade.h:8
#: ../data/glade/RenegotiationDetailsDialog.glade.h:7
#: ../data/glade/FinishPurchaseStep.glade.h:3
#: ../data/glade/ReceivingOrderDetailsDialog.glade.h:1
msgid "Notes"
msgstr "Notas"
-#: ../data/glade/SaleDetailsDialog.glade.h:13
+#: ../data/glade/SaleDetailsDialog.glade.h:11
+#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:8
+#: ../data/glade/PurchaseDetailsDialog.glade.h:17
+msgid "Penalty:"
+msgstr "Juros diários:"
+
+#: ../data/glade/SaleDetailsDialog.glade.h:15
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:5
#: ../data/glade/RenegotiationDetailsDialog.glade.h:13
#: ../data/glade/PurchaseDetailsDialog.glade.h:22
msgid "Surcharge:"
msgstr "Acréscimo:"
+#: ../data/glade/SaleDetailsDialog.glade.h:16
+#: ../data/glade/PurchaseDetailsDialog.glade.h:23
+#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:3
+#: ../data/glade/SaleReturnSlave.glade.h:11
+msgid "Total Paid:"
+msgstr "Total Pago:"
+
#: ../data/glade/QuoteSupplierStep.glade.h:1
msgid "Include all products in quotes"
msgstr "Incluir todos os produtos na cotação"
@@ -5808,11 +5827,6 @@
msgid "History"
msgstr "Histórico"
-#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:5
-#: ../data/glade/PaymentMethodEditor.glade.h:7
-msgid "Interest:"
-msgstr "Multa:"
-
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:6
#: ../data/glade/InstallmentConfirmation.glade.h:7
msgid "Paid date:"
@@ -5822,10 +5836,6 @@
msgid "Paid value:"
msgstr "Valor Pago:"
-#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:8
-msgid "Penalty:"
-msgstr "Juros diários:"
-
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:10
#: ../data/glade/DeviceConstantEditor.glade.h:5
#: ../data/glade/SellableTaxConstantEditor.glade.h:2
@@ -5968,7 +5978,7 @@
msgstr "Cônjuge:"
#: ../data/glade/NoteSlave.glade.h:1
-#: ../data/glade/PurchaseDetailsDialog.glade.h:10
+#: ../data/glade/PurchaseDetailsDialog.glade.h:9
msgid "Notes:"
msgstr "Notas:"
@@ -6227,33 +6237,38 @@
msgid "Phone Number:"
msgstr "Telefone:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:3
+#: ../data/glade/PurchaseDetailsDialog.glade.h:1
msgid "Additional Info"
msgstr "Informações Adicionais"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:7
+#: ../data/glade/PurchaseDetailsDialog.glade.h:5
+#: ../data/glade/StartPurchaseStep.glade.h:5
+msgid "Expected Freight:"
+msgstr "Previsão para Frete:"
+
+#: ../data/glade/PurchaseDetailsDialog.glade.h:6
#: ../data/glade/FinishPurchaseStep.glade.h:2
msgid "Expected Receival Date:"
msgstr "Data Prevista para Recebimento:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:8
-#: ../data/glade/StartPurchaseStep.glade.h:8
+#: ../data/glade/PurchaseDetailsDialog.glade.h:7
+#: ../data/glade/StartPurchaseStep.glade.h:7
msgid "Freight Type:"
msgstr "Tipo de Frete:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:11
+#: ../data/glade/PurchaseDetailsDialog.glade.h:10
#: ../data/glade/CreditProviderMethodSlave.glade.h:3
msgid "Number of Installments:"
msgstr "Número de Parcelas:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:13
+#: ../data/glade/PurchaseDetailsDialog.glade.h:12
#: ../data/glade/PaymentChangeDialog.glade.h:2
-#: ../data/glade/StartPurchaseStep.glade.h:11
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:10
+#: ../data/glade/StartPurchaseStep.glade.h:9
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:13
msgid "Order Number:"
msgstr "Número do Pedido:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:14
+#: ../data/glade/PurchaseDetailsDialog.glade.h:13
msgid "Order Status:"
msgstr "Situação do Pedido:"
@@ -6300,7 +6315,11 @@
msgid "Price ($CURRENCY):"
msgstr "Preço ($CURRENCY):"
-#: ../data/glade/StartPurchaseStep.glade.h:4
+#: ../data/glade/StartPurchaseStep.glade.h:1
+msgid "$CURRENCY"
+msgstr "R$MOEDA"
+
+#: ../data/glade/StartPurchaseStep.glade.h:2
msgid "A_dd/Edit Supplier..."
msgstr "A_dicionar/Editar Fornecedor..."
@@ -6325,11 +6344,6 @@
"<b>Os pagamentos em aberto serão cancelados e novos pagamentos serão criados "
"para o valor restante. </b>"
-#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:3
-#: ../data/glade/SaleReturnSlave.glade.h:11
-msgid "Total Paid:"
-msgstr "Total Pago:"
-
#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:5
msgid "kiwilabel1"
msgstr "label"
@@ -6520,7 +6534,7 @@
msgstr "Detalhes..."
#: ../data/glade/InstallmentConfirmation.glade.h:3
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:3
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:4
msgid "Discount ($CURRENCY):"
msgstr "Desconto ($CURRENCY):"
@@ -6638,7 +6652,7 @@
msgstr "Senha:"
#: ../data/glade/ProductsAdjustment.glade.h:4
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:7
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:10
#: ../data/glade/FiscalBookEntryEditor.glade.h:3
msgid "Invoice Number:"
msgstr "Número da Nota Fiscal:"
@@ -6723,31 +6737,39 @@
msgid "Financial Status:"
msgstr "Situação Financeira:"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:4
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:3
+msgid "Create a separate payment for freight"
+msgstr "Criar um pagamento separado para frete"
+
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:5
msgid "Freight ($CURRENCY):"
msgstr "Frete ($CURRENCY):"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:5
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:7
msgid "ICMS Total ($CURRENCY):"
msgstr "ICMS Total ($CURRENCY):"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:6
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:8
msgid "IPI ($CURRENCY):"
msgstr "IPI ($CURRENCY):"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:8
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:9
+msgid "Include freight value in installments"
+msgstr "Incluir valor do frete nos pagamentos"
+
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:11
msgid "Invoice Total ($CURRENCY):"
msgstr "Total da Nota Fiscal ($CURRENCY):"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:11
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:14
msgid "Others Expenditures ($CURRENCY):"
msgstr "Outras Despesas ($CURRENCY):"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:12
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:15
msgid "Products Total ($CURRENCY):"
msgstr "Total de Produtos ($CURRENCY):"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:13
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:16
msgid "Secure ($CURRENCY):"
msgstr "Seguro ($CURRENCY):"
@@ -7175,6 +7197,21 @@
msgid "TRANSFER RECEIPT"
msgstr "RECIBO DE TRANSFERÊNCIA"
+#~ msgid "Payment number"
+#~ msgstr "Número do pagamento"
+
+#~ msgid "C.M."
+#~ msgstr "M.C."
+
+#~ msgid "Additional Instructions:"
+#~ msgstr "Instruções _Adicionais:"
+
+#~ msgid "Total %s"
+#~ msgstr "Total %s"
+
+#~ msgid "Received Date"
+#~ msgstr "Data de Recebimento"
+
#~ msgid "Quantity Sold"
#~ msgstr "Vendido"
Modified: stoqlib/trunk/po/stoqlib.pot
==============================================================================
--- stoqlib/trunk/po/stoqlib.pot Mon Jul 6 15:54:12 2009 (r8146)
+++ stoqlib/trunk/po/stoqlib.pot Mon Jul 6 15:54:49 2009 (r8147)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 10:45-0300\n"
+"POT-Creation-Date: 2009-07-06 15:52-0300\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"
@@ -16,209 +16,33 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../stoqlib/reporting/payment.py:37
+#: ../stoqlib/reporting/payment.py:35
msgid "Payment Report"
msgstr ""
-#: ../stoqlib/reporting/payment.py:52 ../stoqlib/reporting/service.py:72
-#: ../stoqlib/reporting/template.py:321 ../stoqlib/reporting/sale.py:111
-#: ../stoqlib/reporting/sale.py:255
-#: ../stoqlib/reporting/purchase_receival.py:63
-#: ../stoqlib/reporting/till.py:64 ../stoqlib/gui/editors/producteditor.py:138
-#: ../stoqlib/gui/search/salesearch.py:91
-#: ../stoqlib/gui/dialogs/tillhistory.py:80
-#: ../stoqlib/gui/dialogs/receivingdialog.py:71
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:92
-#: ../stoqlib/gui/dialogs/saledetails.py:105
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:70
-#: ../stoqlib/gui/dialogs/clientdetails.py:112
-#: ../stoqlib/gui/dialogs/supplierdetails.py:108
-#: ../stoqlib/gui/dialogs/purchasedetails.py:109
-#: ../stoqlib/gui/dialogs/productstockdetails.py:91
-#: ../data/glade/SalesPersonStep.glade.h:9
-#: ../data/glade/SaleDetailsDialog.glade.h:14
-#: ../data/glade/PurchaseItemEditor.glade.h:8
-#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:6
-#: ../data/glade/MultipleMethodSlave.glade.h:5
-#: ../data/glade/RenegotiationDetailsDialog.glade.h:14
-#: ../data/glade/PurchaseDetailsDialog.glade.h:23
-#: ../data/glade/ReceivingItemEditor.glade.h:8
-#: ../data/glade/PurchasePaymentStep.glade.h:4
-#: ../data/glade/SaleQuoteItemEditor.glade.h:6
-msgid "Total:"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:65 ../stoqlib/reporting/sale.py:170
-#: ../stoqlib/gui/search/salesearch.py:68
-#: ../stoqlib/gui/search/paymentsearch.py:76
-#: ../stoqlib/gui/wizards/receivingwizard.py:96
-#: ../stoqlib/gui/dialogs/tillhistory.py:61
-msgid "Number"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:67 ../stoqlib/reporting/payment.py:94
-#: ../stoqlib/reporting/service.py:56 ../stoqlib/reporting/template.py:311
-#: ../stoqlib/reporting/product.py:166 ../stoqlib/reporting/purchase.py:166
-#: ../stoqlib/reporting/till.py:52 ../stoqlib/gui/editors/tilleditor.py:212
-#: ../stoqlib/gui/editors/invoiceeditor.py:228
-#: ../stoqlib/gui/editors/invoiceeditor.py:286
-#: ../stoqlib/gui/editors/sellableeditor.py:102
-#: ../stoqlib/gui/editors/producteditor.py:124
-#: ../stoqlib/gui/search/servicesearch.py:110
-#: ../stoqlib/gui/search/fiscalsearch.py:72
-#: ../stoqlib/gui/search/categorysearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:154
-#: ../stoqlib/gui/search/productsearch.py:229
-#: ../stoqlib/gui/search/productsearch.py:275
-#: ../stoqlib/gui/search/purchasesearch.py:78
-#: ../stoqlib/gui/search/sellablesearch.py:122
-#: ../stoqlib/gui/search/tillsearch.py:118
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:80
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:125
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:88
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:114
-#: ../stoqlib/gui/wizards/salequotewizard.py:169
-#: ../stoqlib/gui/wizards/purchasewizard.py:235
-#: ../stoqlib/gui/wizards/receivingwizard.py:243
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:131
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:465
-#: ../stoqlib/gui/dialogs/quotedialog.py:91
-#: ../stoqlib/gui/dialogs/initialstockdialog.py:83
-#: ../stoqlib/gui/dialogs/openinventorydialog.py:141
-#: ../stoqlib/gui/dialogs/tillhistory.py:65
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:103
-#: ../stoqlib/gui/dialogs/receivingdialog.py:83
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:124
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:142
-#: ../stoqlib/gui/dialogs/productcountingdialog.py:75
-#: ../stoqlib/gui/dialogs/devices.py:50
-#: ../stoqlib/gui/dialogs/saledetails.py:152
-#: ../stoqlib/gui/dialogs/saledetails.py:173
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:81
-#: ../stoqlib/gui/dialogs/clientdetails.py:137
-#: ../stoqlib/gui/dialogs/clientdetails.py:148
-#: ../stoqlib/gui/dialogs/clientdetails.py:159
-#: ../stoqlib/gui/dialogs/supplierdetails.py:131
-#: ../stoqlib/gui/dialogs/supplierdetails.py:144
-#: ../stoqlib/gui/dialogs/purchasedetails.py:157
-#: ../stoqlib/gui/dialogs/purchasedetails.py:170
-#: ../stoqlib/gui/dialogs/purchasedetails.py:186
-#: ../stoqlib/gui/slaves/installmentslave.py:228
-#: ../stoqlib/gui/slaves/paymentslave.py:1035
-msgid "Description"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:69
-#: ../stoqlib/gui/search/fiscalsearch.py:128
-msgid "Drawee"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:72 ../stoqlib/reporting/payment.py:99
-#: ../stoqlib/reporting/payment.py:133 ../stoqlib/reporting/purchase.py:168
-msgid "Due date"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:74 ../stoqlib/reporting/payment.py:101
-#: ../stoqlib/reporting/payment.py:135
-#: ../stoqlib/gui/slaves/installmentslave.py:230
-msgid "Paid date"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:76 ../stoqlib/reporting/payment.py:103
-#: ../stoqlib/reporting/payment.py:137 ../stoqlib/reporting/sale.py:182
-#: ../stoqlib/gui/search/personsearch.py:116
-#: ../stoqlib/gui/search/personsearch.py:336
-#: ../stoqlib/gui/search/paymentsearch.py:82
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:133
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:92
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:131
-#: ../stoqlib/gui/dialogs/saledetails.py:159
-#: ../stoqlib/gui/dialogs/clientdetails.py:129
-#: ../stoqlib/gui/dialogs/clientdetails.py:164
-#: ../stoqlib/gui/dialogs/supplierdetails.py:123
-#: ../stoqlib/gui/dialogs/supplierdetails.py:149
-#: ../stoqlib/gui/dialogs/purchasedetails.py:194
-#: ../stoqlib/domain/payment/views.py:262
-msgid "Status"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:78 ../stoqlib/reporting/payment.py:105
-#: ../stoqlib/reporting/payment.py:139 ../stoqlib/reporting/purchase.py:170
-#: ../stoqlib/reporting/sale.py:235 ../stoqlib/reporting/till.py:56
+#: ../stoqlib/reporting/payment.py:48 ../stoqlib/reporting/purchase.py:169
+#: ../stoqlib/reporting/sale.py:191 ../stoqlib/reporting/till.py:49
#: ../stoqlib/gui/search/tillsearch.py:124
#: ../stoqlib/gui/search/paymentsearch.py:85
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:134
#: ../stoqlib/gui/wizards/renegotiationwizard.py:93
#: ../stoqlib/gui/dialogs/tillhistory.py:68
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:132
-#: ../stoqlib/gui/dialogs/saledetails.py:160
+#: ../stoqlib/gui/dialogs/saledetails.py:153
#: ../stoqlib/gui/dialogs/clientdetails.py:166
#: ../stoqlib/gui/dialogs/supplierdetails.py:151
-#: ../stoqlib/gui/dialogs/purchasedetails.py:195
-#: ../stoqlib/gui/slaves/installmentslave.py:231
+#: ../stoqlib/gui/dialogs/purchasedetails.py:178
+#: ../stoqlib/gui/slaves/installmentslave.py:247
#: ../stoqlib/gui/slaves/paymentslave.py:1037
#: ../plugins/ecf/deviceconstanteditor.py:136
msgid "Value"
msgstr ""
-#: ../stoqlib/reporting/payment.py:92 ../stoqlib/reporting/payment.py:119
-#: ../stoqlib/reporting/purchase.py:162
-#: ../stoqlib/gui/search/fiscalsearch.py:121
-#: ../stoqlib/gui/search/transfersearch.py:89
-#: ../stoqlib/gui/search/tillsearch.py:113
-#: ../stoqlib/gui/search/paymentsearch.py:68
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:87
-#: ../stoqlib/gui/dialogs/clientdetails.py:122
-#: ../stoqlib/gui/dialogs/clientdetails.py:154
-#: ../stoqlib/gui/dialogs/supplierdetails.py:118
-#: ../stoqlib/gui/dialogs/supplierdetails.py:139
-#: ../stoqlib/gui/dialogs/productstockdetails.py:127
-#: ../stoqlib/gui/dialogs/productstockdetails.py:142
-#: ../stoqlib/gui/dialogs/productstockdetails.py:156
-#: ../stoqlib/gui/dialogs/productstockdetails.py:172
-msgid "#"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:96
-#: ../stoqlib/reporting/purchase_receival.py:50
-#: ../stoqlib/gui/editors/personeditor.py:249
-#: ../stoqlib/gui/editors/producteditor.py:370
-#: ../stoqlib/gui/editors/producteditor.py:390
-#: ../stoqlib/gui/search/receivingsearch.py:81
-#: ../stoqlib/gui/wizards/receivingwizard.py:102
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:183
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:352
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:467
-#: ../stoqlib/gui/dialogs/productstockdetails.py:133
-msgid "Supplier"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:121
-#: ../stoqlib/gui/search/paymentsearch.py:70
-msgid "Bank"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:124
-#: ../stoqlib/reporting/purchase_receival.py:52
-#: ../stoqlib/gui/editors/personeditor.py:297
-#: ../stoqlib/gui/search/stationsearch.py:63 ../stoqlib/gui/base/search.py:303
-msgid "Branch"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:127
-#: ../stoqlib/gui/search/paymentsearch.py:74
-msgid "Account"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:130
-msgid "Payment number"
-msgstr ""
-
#: ../stoqlib/reporting/receival_receipt.py:39
msgid "Receival receipt"
msgstr ""
-#: ../stoqlib/reporting/service.py:41 ../stoqlib/reporting/service.py:81
+#: ../stoqlib/reporting/service.py:41 ../stoqlib/reporting/service.py:63
msgid "Service Listing"
msgstr ""
@@ -229,79 +53,27 @@
msgstr ""
#: ../stoqlib/reporting/service.py:43
-#: ../stoqlib/gui/search/servicesearch.py:55
+#: ../stoqlib/gui/search/servicesearch.py:56
msgid "services"
msgstr ""
-#. XXX Bug #2430 will improve this part
-#: ../stoqlib/reporting/service.py:55 ../stoqlib/reporting/template.py:310
-#: ../stoqlib/reporting/product.py:165 ../stoqlib/reporting/sale.py:81
-#: ../stoqlib/reporting/sale.py:226 ../stoqlib/reporting/till.py:50
-#: ../stoqlib/gui/editors/producteditor.py:119
-#: ../stoqlib/gui/search/servicesearch.py:106
-#: ../stoqlib/gui/search/productsearch.py:148
-#: ../stoqlib/gui/search/productsearch.py:227
-#: ../stoqlib/gui/search/productsearch.py:271
-#: ../stoqlib/gui/search/sellablesearch.py:118
-#: ../stoqlib/gui/wizards/purchasewizard.py:234
-#: ../stoqlib/gui/dialogs/initialstockdialog.py:81
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:101
-#: ../stoqlib/gui/dialogs/receivingdialog.py:81
-#: ../stoqlib/gui/dialogs/productcountingdialog.py:73
-#: ../stoqlib/gui/dialogs/saledetails.py:170
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:79
-#: ../stoqlib/gui/dialogs/clientdetails.py:135
-#: ../stoqlib/gui/dialogs/clientdetails.py:145
-#: ../stoqlib/gui/dialogs/supplierdetails.py:129
-msgid "Code"
-msgstr ""
-
-#: ../stoqlib/reporting/service.py:57 ../stoqlib/reporting/product.py:66
-#: ../stoqlib/reporting/purchase.py:102 ../stoqlib/reporting/purchase.py:233
+#: ../stoqlib/reporting/service.py:55 ../stoqlib/reporting/product.py:66
+#: ../stoqlib/reporting/purchase.py:102 ../stoqlib/reporting/purchase.py:232
#: ../stoqlib/gui/editors/producteditor.py:395
-#: ../stoqlib/gui/search/servicesearch.py:114
-#: ../stoqlib/gui/search/productsearch.py:163
+#: ../stoqlib/gui/search/servicesearch.py:115
+#: ../stoqlib/gui/search/productsearch.py:165
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:88
-#: ../stoqlib/gui/wizards/purchasewizard.py:245
-#: ../stoqlib/gui/wizards/receivingwizard.py:251
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:472
+#: ../stoqlib/gui/wizards/purchasewizard.py:251
+#: ../stoqlib/gui/wizards/receivingwizard.py:253
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:475
#: ../stoqlib/gui/dialogs/quotedialog.py:95
#: ../stoqlib/gui/dialogs/receivingdialog.py:88
#: ../stoqlib/gui/dialogs/transferorderdialog.py:85
-#: ../stoqlib/gui/dialogs/purchasedetails.py:163
-#: ../stoqlib/gui/dialogs/purchasedetails.py:177
+#: ../stoqlib/gui/dialogs/purchasedetails.py:146
+#: ../stoqlib/gui/dialogs/purchasedetails.py:160
msgid "Cost"
msgstr ""
-#: ../stoqlib/reporting/service.py:58 ../stoqlib/reporting/template.py:313
-#: ../stoqlib/reporting/product.py:67 ../stoqlib/reporting/sale.py:88
-#: ../stoqlib/gui/search/servicesearch.py:118
-#: ../stoqlib/gui/search/productsearch.py:166
-#: ../stoqlib/gui/search/sellablesearch.py:124
-#: ../stoqlib/gui/wizards/salequotewizard.py:177
-#: ../stoqlib/gui/dialogs/saledetails.py:177
-msgid "Price"
-msgstr ""
-
-#: ../stoqlib/reporting/service.py:59
-msgid "C.M."
-msgstr ""
-
-#. FIXME: This column should be virtual, waiting for bug #2764
-#: ../stoqlib/reporting/service.py:62 ../stoqlib/reporting/product.py:172
-#: ../stoqlib/gui/editors/producteditor.py:123
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:86
-#: ../stoqlib/gui/wizards/salequotewizard.py:175
-#: ../stoqlib/gui/wizards/purchasewizard.py:243
-#: ../stoqlib/gui/wizards/receivingwizard.py:249
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:135
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:105
-#: ../stoqlib/gui/dialogs/productstockdetails.py:139
-#: ../stoqlib/gui/dialogs/productstockdetails.py:153
-#: ../plugins/ecf/ecfdomain.py:248
-msgid "Unit"
-msgstr ""
-
#: ../stoqlib/reporting/template.py:122
#, python-format
msgid "Phone: %s"
@@ -340,6 +112,112 @@
msgid "Totals:"
msgstr ""
+#. XXX Bug #2430 will improve this part
+#: ../stoqlib/reporting/template.py:310 ../stoqlib/reporting/product.py:165
+#: ../stoqlib/reporting/sale.py:80 ../stoqlib/reporting/sale.py:182
+#: ../stoqlib/gui/editors/producteditor.py:119
+#: ../stoqlib/gui/search/servicesearch.py:107
+#: ../stoqlib/gui/search/productsearch.py:149
+#: ../stoqlib/gui/search/productsearch.py:229
+#: ../stoqlib/gui/search/productsearch.py:273
+#: ../stoqlib/gui/search/sellablesearch.py:119
+#: ../stoqlib/gui/wizards/purchasewizard.py:240
+#: ../stoqlib/gui/dialogs/initialstockdialog.py:81
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:101
+#: ../stoqlib/gui/dialogs/receivingdialog.py:81
+#: ../stoqlib/gui/dialogs/productcountingdialog.py:73
+#: ../stoqlib/gui/dialogs/saledetails.py:163
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:79
+#: ../stoqlib/gui/dialogs/clientdetails.py:135
+#: ../stoqlib/gui/dialogs/clientdetails.py:145
+#: ../stoqlib/gui/dialogs/supplierdetails.py:129
+msgid "Code"
+msgstr ""
+
+#: ../stoqlib/reporting/template.py:311 ../stoqlib/reporting/product.py:166
+#: ../stoqlib/reporting/purchase.py:165
+#: ../stoqlib/gui/editors/tilleditor.py:212
+#: ../stoqlib/gui/editors/invoiceeditor.py:228
+#: ../stoqlib/gui/editors/invoiceeditor.py:286
+#: ../stoqlib/gui/editors/sellableeditor.py:102
+#: ../stoqlib/gui/editors/producteditor.py:124
+#: ../stoqlib/gui/search/servicesearch.py:111
+#: ../stoqlib/gui/search/fiscalsearch.py:72
+#: ../stoqlib/gui/search/categorysearch.py:63
+#: ../stoqlib/gui/search/productsearch.py:156
+#: ../stoqlib/gui/search/productsearch.py:231
+#: ../stoqlib/gui/search/productsearch.py:277
+#: ../stoqlib/gui/search/purchasesearch.py:78
+#: ../stoqlib/gui/search/sellablesearch.py:124
+#: ../stoqlib/gui/search/tillsearch.py:118
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:80
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:125
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:88
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:114
+#: ../stoqlib/gui/wizards/salequotewizard.py:169
+#: ../stoqlib/gui/wizards/purchasewizard.py:241
+#: ../stoqlib/gui/wizards/receivingwizard.py:245
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:132
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:468
+#: ../stoqlib/gui/dialogs/quotedialog.py:91
+#: ../stoqlib/gui/dialogs/initialstockdialog.py:83
+#: ../stoqlib/gui/dialogs/openinventorydialog.py:141
+#: ../stoqlib/gui/dialogs/tillhistory.py:65
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:103
+#: ../stoqlib/gui/dialogs/receivingdialog.py:83
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:124
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:142
+#: ../stoqlib/gui/dialogs/productcountingdialog.py:75
+#: ../stoqlib/gui/dialogs/devices.py:50
+#: ../stoqlib/gui/dialogs/saledetails.py:145
+#: ../stoqlib/gui/dialogs/saledetails.py:166
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:81
+#: ../stoqlib/gui/dialogs/clientdetails.py:137
+#: ../stoqlib/gui/dialogs/clientdetails.py:148
+#: ../stoqlib/gui/dialogs/clientdetails.py:159
+#: ../stoqlib/gui/dialogs/supplierdetails.py:131
+#: ../stoqlib/gui/dialogs/supplierdetails.py:144
+#: ../stoqlib/gui/dialogs/purchasedetails.py:140
+#: ../stoqlib/gui/dialogs/purchasedetails.py:153
+#: ../stoqlib/gui/dialogs/purchasedetails.py:169
+#: ../stoqlib/gui/slaves/installmentslave.py:244
+#: ../stoqlib/gui/slaves/paymentslave.py:1035
+msgid "Description"
+msgstr ""
+
+#: ../stoqlib/reporting/template.py:313 ../stoqlib/reporting/product.py:67
+#: ../stoqlib/reporting/sale.py:87 ../stoqlib/gui/search/servicesearch.py:119
+#: ../stoqlib/gui/search/productsearch.py:168
+#: ../stoqlib/gui/search/sellablesearch.py:126
+#: ../stoqlib/gui/wizards/salequotewizard.py:177
+#: ../stoqlib/gui/dialogs/saledetails.py:170
+msgid "Price"
+msgstr ""
+
+#: ../stoqlib/reporting/template.py:321 ../stoqlib/reporting/sale.py:110
+#: ../stoqlib/reporting/sale.py:211
+#: ../stoqlib/gui/editors/producteditor.py:138
+#: ../stoqlib/gui/search/salesearch.py:91
+#: ../stoqlib/gui/dialogs/tillhistory.py:80
+#: ../stoqlib/gui/dialogs/receivingdialog.py:71
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:92
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:70
+#: ../stoqlib/gui/dialogs/clientdetails.py:112
+#: ../stoqlib/gui/dialogs/supplierdetails.py:108
+#: ../stoqlib/gui/dialogs/productstockdetails.py:91
+#: ../data/glade/SalesPersonStep.glade.h:9
+#: ../data/glade/SaleDetailsDialog.glade.h:17
+#: ../data/glade/PurchaseItemEditor.glade.h:8
+#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:6
+#: ../data/glade/MultipleMethodSlave.glade.h:5
+#: ../data/glade/RenegotiationDetailsDialog.glade.h:14
+#: ../data/glade/PurchaseDetailsDialog.glade.h:24
+#: ../data/glade/ReceivingItemEditor.glade.h:8
+#: ../data/glade/PurchasePaymentStep.glade.h:4
+#: ../data/glade/SaleQuoteItemEditor.glade.h:6
+msgid "Total:"
+msgstr ""
+
#: ../stoqlib/reporting/template.py:333
msgid "Untitled"
msgstr ""
@@ -361,42 +239,43 @@
msgstr ""
#: ../stoqlib/reporting/product.py:68
-#: ../stoqlib/gui/search/productsearch.py:169
+#: ../stoqlib/gui/search/productsearch.py:171
msgid "Stock Total"
msgstr ""
#: ../stoqlib/reporting/product.py:92 ../stoqlib/reporting/product.py:170
-#: ../stoqlib/reporting/purchase.py:104 ../stoqlib/reporting/purchase.py:234
-#: ../stoqlib/reporting/sale.py:86 ../stoqlib/gui/editors/producteditor.py:121
+#: ../stoqlib/reporting/purchase.py:104 ../stoqlib/reporting/purchase.py:233
+#: ../stoqlib/reporting/sale.py:85 ../stoqlib/gui/editors/producteditor.py:121
+#: ../stoqlib/gui/search/salesearch.py:136
#: ../stoqlib/gui/wizards/salequotewizard.py:173
-#: ../stoqlib/gui/wizards/purchasewizard.py:239
-#: ../stoqlib/gui/wizards/receivingwizard.py:245
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:133
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:469
+#: ../stoqlib/gui/wizards/purchasewizard.py:245
+#: ../stoqlib/gui/wizards/receivingwizard.py:247
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:134
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:472
#: ../stoqlib/gui/dialogs/quotedialog.py:93
#: ../stoqlib/gui/dialogs/receivingdialog.py:85
-#: ../stoqlib/gui/dialogs/saledetails.py:175
+#: ../stoqlib/gui/dialogs/saledetails.py:168
#: ../stoqlib/gui/dialogs/transferorderdialog.py:83
-#: ../stoqlib/gui/dialogs/purchasedetails.py:160
+#: ../stoqlib/gui/dialogs/purchasedetails.py:143
#: ../stoqlib/gui/dialogs/productstockdetails.py:137
msgid "Quantity"
msgstr ""
#: ../stoqlib/reporting/product.py:119 ../stoqlib/reporting/product.py:189
-#: ../stoqlib/gui/search/productsearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:249
+#: ../stoqlib/gui/search/productsearch.py:64
+#: ../stoqlib/gui/search/productsearch.py:251
msgid "products"
msgstr ""
#: ../stoqlib/reporting/product.py:136
-#: ../stoqlib/gui/search/productsearch.py:231
+#: ../stoqlib/gui/search/productsearch.py:233
#: ../stoqlib/gui/dialogs/productstockdetails.py:150
-#: ../stoqlib/domain/sellable.py:250
+#: ../stoqlib/domain/sellable.py:248
msgid "Sold"
msgstr ""
#: ../stoqlib/reporting/product.py:137 ../stoqlib/reporting/purchase.py:68
-#: ../stoqlib/gui/search/productsearch.py:238
+#: ../stoqlib/gui/search/productsearch.py:240
#: ../stoqlib/gui/search/purchasesearch.py:82
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:84
#: ../data/glade/PurchaseDetailsDialog.glade.h:18
@@ -404,13 +283,13 @@
msgstr ""
#: ../stoqlib/reporting/product.py:138
-#: ../stoqlib/gui/search/productsearch.py:234
+#: ../stoqlib/gui/search/productsearch.py:236
#: ../stoqlib/gui/dialogs/productstockdetails.py:168
msgid "Transfered"
msgstr ""
#: ../stoqlib/reporting/product.py:140
-#: ../stoqlib/gui/search/productsearch.py:236
+#: ../stoqlib/gui/search/productsearch.py:238
msgid "Retained"
msgstr ""
@@ -428,28 +307,43 @@
msgid "Fiscal Class"
msgstr ""
+#. FIXME: This column should be virtual, waiting for bug #2764
+#: ../stoqlib/reporting/product.py:172
+#: ../stoqlib/gui/editors/producteditor.py:123
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:86
+#: ../stoqlib/gui/wizards/salequotewizard.py:175
+#: ../stoqlib/gui/wizards/purchasewizard.py:249
+#: ../stoqlib/gui/wizards/receivingwizard.py:251
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:136
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:105
+#: ../stoqlib/gui/dialogs/productstockdetails.py:139
+#: ../stoqlib/gui/dialogs/productstockdetails.py:153
+#: ../plugins/ecf/ecfdomain.py:248
+msgid "Unit"
+msgstr ""
+
#: ../stoqlib/reporting/product.py:188
msgid "Product Stock Report"
msgstr ""
#: ../stoqlib/reporting/product.py:208
-#: ../stoqlib/gui/search/productsearch.py:279
+#: ../stoqlib/gui/search/productsearch.py:281
msgid "Maximum"
msgstr ""
#: ../stoqlib/reporting/product.py:209
-#: ../stoqlib/gui/search/productsearch.py:282
+#: ../stoqlib/gui/search/productsearch.py:284
msgid "Minimum"
msgstr ""
#: ../stoqlib/reporting/product.py:210
-#: ../stoqlib/gui/search/productsearch.py:284
+#: ../stoqlib/gui/search/productsearch.py:286
#: ../stoqlib/gui/search/purchasesearch.py:84
msgid "In Stock"
msgstr ""
#: ../stoqlib/reporting/product.py:212
-#: ../stoqlib/gui/search/productsearch.py:286
+#: ../stoqlib/gui/search/productsearch.py:288
msgid "To Receive"
msgstr ""
@@ -461,51 +355,50 @@
msgid "orders"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:48 ../stoqlib/reporting/sale.py:154
+#: ../stoqlib/reporting/purchase.py:48 ../stoqlib/reporting/sale.py:137
#, python-format
msgid "with status <u>%s</u>"
msgstr ""
#: ../stoqlib/reporting/purchase.py:66
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:82
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:470
-#: ../stoqlib/domain/sale.py:278
-#: ../data/glade/PurchaseDetailsDialog.glade.h:15
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:473
+#: ../stoqlib/domain/sale.py:280
+#: ../data/glade/PurchaseDetailsDialog.glade.h:14
msgid "Ordered"
msgstr ""
#: ../stoqlib/reporting/purchase.py:70 ../stoqlib/reporting/purchase.py:106
-#: ../stoqlib/reporting/purchase.py:111 ../stoqlib/reporting/purchase.py:236
-#: ../stoqlib/reporting/sale.py:179 ../stoqlib/gui/search/salesearch.py:80
+#: ../stoqlib/reporting/purchase.py:111 ../stoqlib/reporting/purchase.py:235
+#: ../stoqlib/reporting/sale.py:149 ../stoqlib/gui/search/salesearch.py:80
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:89
#: ../stoqlib/gui/wizards/stocktransferwizard.py:120
#: ../stoqlib/gui/wizards/salequotewizard.py:179
-#: ../stoqlib/gui/wizards/purchasewizard.py:247
-#: ../stoqlib/gui/wizards/receivingwizard.py:253
+#: ../stoqlib/gui/wizards/purchasewizard.py:253
+#: ../stoqlib/gui/wizards/receivingwizard.py:255
#: ../stoqlib/gui/dialogs/receivingdialog.py:91
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:146
-#: ../stoqlib/gui/dialogs/saledetails.py:178
+#: ../stoqlib/gui/dialogs/saledetails.py:171
#: ../stoqlib/gui/dialogs/clientdetails.py:131
#: ../stoqlib/gui/dialogs/supplierdetails.py:125
-#: ../stoqlib/gui/dialogs/purchasedetails.py:129
-#: ../stoqlib/gui/dialogs/purchasedetails.py:165
-#: ../stoqlib/gui/dialogs/purchasedetails.py:180
+#: ../stoqlib/gui/dialogs/purchasedetails.py:112
+#: ../stoqlib/gui/dialogs/purchasedetails.py:148
+#: ../stoqlib/gui/dialogs/purchasedetails.py:163
msgid "Total"
msgstr ""
#: ../stoqlib/reporting/purchase.py:81
-#: ../stoqlib/reporting/purchase_receival.py:48
#: ../stoqlib/gui/dialogs/productstockdetails.py:131
msgid "Purchase Order"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:95 ../stoqlib/reporting/purchase.py:228
-#: ../stoqlib/reporting/sale.py:83
+#: ../stoqlib/reporting/purchase.py:95 ../stoqlib/reporting/purchase.py:227
+#: ../stoqlib/reporting/sale.py:82 ../stoqlib/gui/search/salesearch.py:127
msgid "Item"
msgstr ""
#: ../stoqlib/reporting/purchase.py:109
-#: ../stoqlib/gui/wizards/receivingwizard.py:108
+#: ../stoqlib/gui/wizards/receivingwizard.py:109
msgid "Qty Received"
msgstr ""
@@ -513,50 +406,70 @@
msgid "Purchase Ordered Items"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:138 ../stoqlib/reporting/purchase.py:193
-#: ../stoqlib/domain/sale.py:559
+#: ../stoqlib/reporting/purchase.py:138 ../stoqlib/reporting/purchase.py:192
+#: ../stoqlib/domain/sale.py:578
msgid "Not Specified"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:239
-#: ../data/glade/PurchaseDetailsDialog.glade.h:24
+#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:238
+#: ../data/glade/PurchaseDetailsDialog.glade.h:25
#: ../data/glade/FinishPurchaseStep.glade.h:6
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:15
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:18
msgid "Transporter:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:240
-#: ../data/glade/PurchaseDetailsDialog.glade.h:9
-#: ../data/glade/StartPurchaseStep.glade.h:9
+#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:239
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:6
#: ../data/glade/TransporterDataSlave.glade.h:4
msgid "Freight:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:154
+#: ../stoqlib/reporting/purchase.py:153
#, python-format
msgid "Payments: %d installments"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:157
+#: ../stoqlib/reporting/purchase.py:156
msgid "Payments: 1 installment"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:164
+#: ../stoqlib/reporting/purchase.py:161
+#: ../stoqlib/gui/search/fiscalsearch.py:121
+#: ../stoqlib/gui/search/transfersearch.py:89
+#: ../stoqlib/gui/search/tillsearch.py:113
+#: ../stoqlib/gui/search/paymentsearch.py:68
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:87
+#: ../stoqlib/gui/dialogs/clientdetails.py:122
+#: ../stoqlib/gui/dialogs/clientdetails.py:154
+#: ../stoqlib/gui/dialogs/supplierdetails.py:118
+#: ../stoqlib/gui/dialogs/supplierdetails.py:139
+#: ../stoqlib/gui/dialogs/productstockdetails.py:127
+#: ../stoqlib/gui/dialogs/productstockdetails.py:142
+#: ../stoqlib/gui/dialogs/productstockdetails.py:156
+#: ../stoqlib/gui/dialogs/productstockdetails.py:172
+msgid "#"
+msgstr ""
+
+#: ../stoqlib/reporting/purchase.py:163
msgid "Method"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:181 ../stoqlib/reporting/purchase.py:247
+#: ../stoqlib/reporting/purchase.py:167
+msgid "Due date"
+msgstr ""
+
+#: ../stoqlib/reporting/purchase.py:180 ../stoqlib/reporting/purchase.py:246
#: ../data/glade/TillClosing.glade.h:5
-#: ../data/glade/SaleDetailsDialog.glade.h:8
+#: ../data/glade/SaleDetailsDialog.glade.h:9
#: ../data/glade/OpenInventoryDialog.glade.h:3
#: ../data/glade/RenegotiationDetailsDialog.glade.h:8
-#: ../data/glade/PurchaseDetailsDialog.glade.h:12
-#: ../data/glade/StartPurchaseStep.glade.h:10
+#: ../data/glade/PurchaseDetailsDialog.glade.h:11
+#: ../data/glade/StartPurchaseStep.glade.h:8
msgid "Open Date:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:182
-#: ../data/glade/SaleDetailsDialog.glade.h:11
+#: ../stoqlib/reporting/purchase.py:181
+#: ../data/glade/SaleDetailsDialog.glade.h:13
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:9
#: ../data/glade/RenegotiationDetailsDialog.glade.h:11
#: ../data/glade/PaymentChangeDialog.glade.h:4
@@ -567,20 +480,20 @@
msgid "Status:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:183 ../stoqlib/reporting/purchase.py:250
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:334
+#: ../stoqlib/reporting/purchase.py:182 ../stoqlib/reporting/purchase.py:249
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:336
#: ../stoqlib/gui/dialogs/paymentchangedialog.py:71
#: ../data/glade/PurchaseDetailsDialog.glade.h:21
-#: ../data/glade/StartPurchaseStep.glade.h:12
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:14
+#: ../data/glade/StartPurchaseStep.glade.h:10
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:17
#: ../data/glade/SupplierDetailsDialog.glade.h:7
msgid "Supplier:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:184 ../stoqlib/reporting/purchase.py:251
+#: ../stoqlib/reporting/purchase.py:183 ../stoqlib/reporting/purchase.py:250
#: ../data/glade/OpenInventoryDialog.glade.h:1
-#: ../data/glade/PurchaseDetailsDialog.glade.h:4
-#: ../data/glade/StartPurchaseStep.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:2
+#: ../data/glade/StartPurchaseStep.glade.h:3
#: ../data/glade/StationEditor.glade.h:2
#: ../data/glade/ProductsAdjustment.glade.h:1
#: ../data/glade/ReceivingInvoiceSlave.glade.h:1
@@ -588,70 +501,70 @@
msgid "Branch:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:194
+#: ../stoqlib/reporting/purchase.py:193
#, python-format
msgid "Expected Receival Date: %s"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:209
+#: ../stoqlib/reporting/purchase.py:208
#, python-format
msgid "Purchase Order #%s"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:215
+#: ../stoqlib/reporting/purchase.py:214
msgid "Quote Request"
msgstr ""
#. To be filled
-#: ../stoqlib/reporting/purchase.py:249 ../data/glade/StartQuoteStep.glade.h:2
+#: ../stoqlib/reporting/purchase.py:248 ../data/glade/StartQuoteStep.glade.h:2
msgid "Deadline:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:260
+#: ../stoqlib/reporting/purchase.py:259
msgid "Payment Settings"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:264
-#: ../data/glade/PurchaseDetailsDialog.glade.h:16
+#: ../stoqlib/reporting/purchase.py:263
+#: ../data/glade/PurchaseDetailsDialog.glade.h:15
#: ../data/glade/PurchasePaymentStep.glade.h:2
msgid "Payment Method:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:264
+#: ../stoqlib/reporting/purchase.py:263
msgid "Installments:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:265
+#: ../stoqlib/reporting/purchase.py:264
msgid "Intervals:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:265
+#: ../stoqlib/reporting/purchase.py:264
msgid "Obs:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:272
+#: ../stoqlib/reporting/purchase.py:271
msgid "Quoting Items"
msgstr ""
#. The supplier name here ?
-#: ../stoqlib/reporting/purchase.py:279
+#: ../stoqlib/reporting/purchase.py:278
#: ../stoqlib/gui/dialogs/productstockdetails.py:166
msgid "Responsible"
msgstr ""
-#: ../stoqlib/reporting/sale.py:48
+#: ../stoqlib/reporting/sale.py:47
msgid "Sale Order"
msgstr ""
-#: ../stoqlib/reporting/sale.py:64
+#: ../stoqlib/reporting/sale.py:63
msgid "No client"
msgstr ""
-#: ../stoqlib/reporting/sale.py:69
+#: ../stoqlib/reporting/sale.py:68
msgid "No phone number"
msgstr ""
-#: ../stoqlib/reporting/sale.py:74 ../data/glade/SalesPersonStep.glade.h:2
+#: ../stoqlib/reporting/sale.py:73 ../data/glade/SalesPersonStep.glade.h:2
#: ../data/glade/SaleDetailsDialog.glade.h:3
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:2
#: ../data/glade/DeliveryEditor.glade.h:4
@@ -662,84 +575,53 @@
msgid "Client:"
msgstr ""
-#: ../stoqlib/reporting/sale.py:74
+#: ../stoqlib/reporting/sale.py:73
msgid "Phone number:"
msgstr ""
-#: ../stoqlib/reporting/sale.py:90
+#: ../stoqlib/reporting/sale.py:89
msgid "Sub-Total"
msgstr ""
-#: ../stoqlib/reporting/sale.py:99
+#: ../stoqlib/reporting/sale.py:98
#, python-format
msgid "%s items"
msgstr ""
-#: ../stoqlib/reporting/sale.py:101
+#: ../stoqlib/reporting/sale.py:100
#, python-format
msgid "%s item"
msgstr ""
-#: ../stoqlib/reporting/sale.py:111 ../data/glade/SaleDetailsDialog.glade.h:5
+#: ../stoqlib/reporting/sale.py:110 ../data/glade/SaleDetailsDialog.glade.h:5
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:2
#: ../data/glade/SaleDiscountSlave.glade.h:3
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:3
#: ../data/glade/RenegotiationDetailsDialog.glade.h:5
-#: ../data/glade/PurchaseDetailsDialog.glade.h:6
+#: ../data/glade/PurchaseDetailsDialog.glade.h:4
msgid "Discount:"
msgstr ""
-#: ../stoqlib/reporting/sale.py:125
-msgid "Additional Instructions:"
-msgstr ""
-
-#: ../stoqlib/reporting/sale.py:138
-msgid "Delivery Address:"
+#: ../stoqlib/reporting/sale.py:121 ../stoqlib/gui/wizards/salewizard.py:359
+#: ../stoqlib/gui/wizards/salequotewizard.py:128
+#: ../stoqlib/gui/slaves/receivingslave.py:125
+msgid "Additional Information"
msgstr ""
-#: ../stoqlib/reporting/sale.py:146
+#: ../stoqlib/reporting/sale.py:129
#, python-format
msgid "Sale Order on %s"
msgstr ""
-#: ../stoqlib/reporting/sale.py:152
+#: ../stoqlib/reporting/sale.py:135
msgid "Sales Report"
msgstr ""
-#: ../stoqlib/reporting/sale.py:153
+#: ../stoqlib/reporting/sale.py:136
msgid "sales"
msgstr ""
-#: ../stoqlib/reporting/sale.py:172 ../stoqlib/reporting/till.py:54
-#: ../stoqlib/gui/search/fiscalsearch.py:123
-#: ../stoqlib/gui/search/commissionsearch.py:81
-#: ../stoqlib/gui/search/tillsearch.py:116
-#: ../stoqlib/gui/dialogs/tillhistory.py:63
-#: ../stoqlib/gui/dialogs/clientdetails.py:125
-#: ../stoqlib/gui/dialogs/supplierdetails.py:121
-#: ../stoqlib/gui/dialogs/productstockdetails.py:129
-#: ../data/glade/FiscalMemoryEditor.glade.h:2
-msgid "Date"
-msgstr ""
-
-#: ../stoqlib/reporting/sale.py:174 ../stoqlib/gui/editors/personeditor.py:57
-#: ../stoqlib/gui/search/salesearch.py:72
-#: ../stoqlib/gui/dialogs/productstockdetails.py:149
-msgid "Client"
-msgstr ""
-
-#: ../stoqlib/reporting/sale.py:177 ../stoqlib/gui/search/salesearch.py:75
-#: ../stoqlib/gui/search/commissionsearch.py:71
-#: ../stoqlib/gui/dialogs/clientdetails.py:127
-msgid "Salesperson"
-msgstr ""
-
-#: ../stoqlib/reporting/sale.py:190
-#, python-format
-msgid "Total %s"
-msgstr ""
-
-#: ../stoqlib/reporting/sale.py:202 ../stoqlib/lib/parameters.py:71
+#: ../stoqlib/reporting/sale.py:158 ../stoqlib/lib/parameters.py:71
#: ../stoqlib/lib/parameters.py:102 ../stoqlib/lib/parameters.py:116
#: ../stoqlib/lib/parameters.py:122 ../stoqlib/lib/parameters.py:130
#: ../stoqlib/lib/parameters.py:154 ../stoqlib/lib/parameters.py:166
@@ -754,18 +636,18 @@
msgid "Sales"
msgstr ""
-#: ../stoqlib/reporting/sale.py:208
+#: ../stoqlib/reporting/sale.py:164
#, python-format
msgid "sales on branch %s"
msgstr ""
-#: ../stoqlib/reporting/sale.py:211
+#: ../stoqlib/reporting/sale.py:167
#, python-format
msgid "sales from %s on branch %s"
msgstr ""
#. ListDialog
-#: ../stoqlib/reporting/sale.py:223 ../stoqlib/gui/search/stationsearch.py:57
+#: ../stoqlib/reporting/sale.py:179 ../stoqlib/gui/search/stationsearch.py:57
#: ../stoqlib/gui/search/personsearch.py:111
#: ../stoqlib/gui/search/personsearch.py:140
#: ../stoqlib/gui/search/personsearch.py:179
@@ -778,67 +660,58 @@
msgid "Name"
msgstr ""
-#: ../stoqlib/reporting/sale.py:228
+#: ../stoqlib/reporting/sale.py:184
msgid "Total Amount"
msgstr ""
-#: ../stoqlib/reporting/sale.py:230
+#: ../stoqlib/reporting/sale.py:186
msgid "P/A"
msgstr ""
-#: ../stoqlib/reporting/sale.py:232
+#: ../stoqlib/reporting/sale.py:188
msgid "Percentage"
msgstr ""
-#: ../stoqlib/reporting/sale.py:237
+#: ../stoqlib/reporting/sale.py:193
msgid "S/P"
msgstr ""
-#: ../stoqlib/reporting/sale.py:272
+#: ../stoqlib/reporting/sale.py:228
#, python-format
msgid "Sold value per sales %s"
msgstr ""
-#: ../stoqlib/reporting/sale.py:279
+#: ../stoqlib/reporting/sale.py:235
msgid "P/A: Payment Amount"
msgstr ""
-#: ../stoqlib/reporting/sale.py:280
+#: ../stoqlib/reporting/sale.py:236
msgid "S/P: Sellables sold per sale"
msgstr ""
-#: ../stoqlib/reporting/sale.py:283
+#: ../stoqlib/reporting/sale.py:239
#, python-format
msgid "Total of sales: %d"
msgstr ""
-#: ../stoqlib/reporting/purchase_receival.py:35
+#: ../stoqlib/reporting/purchase_receival.py:34
msgid "Purchase Receival Report"
msgstr ""
-#: ../stoqlib/reporting/purchase_receival.py:36
+#: ../stoqlib/reporting/purchase_receival.py:35
msgid "purchase receivals"
msgstr ""
-#: ../stoqlib/reporting/purchase_receival.py:46
-msgid "Received Date"
-msgstr ""
-
-#: ../stoqlib/reporting/purchase_receival.py:54
-#: ../stoqlib/gui/search/receivingsearch.py:83
-msgid "Invoice #"
-msgstr ""
-
-#: ../stoqlib/reporting/purchase_receival.py:55
+#: ../stoqlib/reporting/purchase_receival.py:47
#: ../stoqlib/gui/search/receivingsearch.py:85
msgid "Invoice Total"
msgstr ""
-#: ../stoqlib/reporting/till.py:38
+#: ../stoqlib/reporting/till.py:37
msgid "Till History Listing"
msgstr ""
-#: ../stoqlib/reporting/till.py:39
+#: ../stoqlib/reporting/till.py:38
msgid "till history"
msgstr ""
@@ -891,7 +764,7 @@
#: ../stoqlib/lib/parameters.py:77 ../stoqlib/lib/parameters.py:83
#: ../stoqlib/lib/parameters.py:89 ../stoqlib/lib/parameters.py:220
-#: ../stoqlib/lib/invoice.py:302
+#: ../stoqlib/lib/invoice.py:304
msgid "Purchase"
msgstr ""
@@ -945,7 +818,7 @@
msgstr ""
#: ../stoqlib/lib/parameters.py:107
-#: ../stoqlib/gui/search/sellablesearch.py:126
+#: ../stoqlib/gui/search/sellablesearch.py:128
#: ../stoqlib/gui/wizards/stocktransferwizard.py:116
msgid "Stock"
msgstr ""
@@ -1226,135 +1099,135 @@
msgid "There is no defined %s parameter datain the database."
msgstr ""
-#: ../stoqlib/lib/invoice.py:294 ../stoqlib/gui/search/commissionsearch.py:69
+#: ../stoqlib/lib/invoice.py:296 ../stoqlib/gui/search/commissionsearch.py:69
msgid "Sale"
msgstr ""
-#: ../stoqlib/lib/invoice.py:339
+#: ../stoqlib/lib/invoice.py:341
msgid "Company document number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:350
+#: ../stoqlib/lib/invoice.py:352
msgid "Outgoing invoice"
msgstr ""
-#: ../stoqlib/lib/invoice.py:361
+#: ../stoqlib/lib/invoice.py:363
msgid "Incoming invoice"
msgstr ""
-#: ../stoqlib/lib/invoice.py:371
+#: ../stoqlib/lib/invoice.py:373
msgid "Client name"
msgstr ""
-#: ../stoqlib/lib/invoice.py:381
+#: ../stoqlib/lib/invoice.py:383
msgid "Client Address"
msgstr ""
-#: ../stoqlib/lib/invoice.py:391
+#: ../stoqlib/lib/invoice.py:393
msgid "Client's document number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:407
+#: ../stoqlib/lib/invoice.py:409
msgid "Client's district"
msgstr ""
-#: ../stoqlib/lib/invoice.py:417
+#: ../stoqlib/lib/invoice.py:419
msgid "Client's postal code"
msgstr ""
-#: ../stoqlib/lib/invoice.py:427
+#: ../stoqlib/lib/invoice.py:429
msgid "Client's city"
msgstr ""
-#: ../stoqlib/lib/invoice.py:437
+#: ../stoqlib/lib/invoice.py:439
msgid "Client Phone number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:446
+#: ../stoqlib/lib/invoice.py:448
msgid "Client Fax number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:455
+#: ../stoqlib/lib/invoice.py:457
msgid "Client Phone/Fax number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:467
+#: ../stoqlib/lib/invoice.py:469
msgid "Client state abbreviation"
msgstr ""
-#: ../stoqlib/lib/invoice.py:477
+#: ../stoqlib/lib/invoice.py:479
msgid "Clients state registry number or document number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:491
+#: ../stoqlib/lib/invoice.py:493
msgid "Emission date"
msgstr ""
-#: ../stoqlib/lib/invoice.py:501
+#: ../stoqlib/lib/invoice.py:503
msgid "Creation date"
msgstr ""
-#: ../stoqlib/lib/invoice.py:511
+#: ../stoqlib/lib/invoice.py:513
msgid "Creation time"
msgstr ""
-#: ../stoqlib/lib/invoice.py:521
+#: ../stoqlib/lib/invoice.py:523
msgid "Number of payments"
msgstr ""
-#: ../stoqlib/lib/invoice.py:531
+#: ../stoqlib/lib/invoice.py:533
msgid "Payment due dates"
msgstr ""
-#: ../stoqlib/lib/invoice.py:541
+#: ../stoqlib/lib/invoice.py:544
msgid "Payment values"
msgstr ""
-#: ../stoqlib/lib/invoice.py:696
+#: ../stoqlib/lib/invoice.py:699
msgid "Product item counter"
msgstr ""
-#: ../stoqlib/lib/invoice.py:708
+#: ../stoqlib/lib/invoice.py:711
msgid "Product item code / description"
msgstr ""
-#: ../stoqlib/lib/invoice.py:724
+#: ../stoqlib/lib/invoice.py:727
msgid "Product item description"
msgstr ""
-#: ../stoqlib/lib/invoice.py:737
+#: ../stoqlib/lib/invoice.py:740
msgid "Product item code"
msgstr ""
-#: ../stoqlib/lib/invoice.py:751
+#: ../stoqlib/lib/invoice.py:754
msgid "Product item situation"
msgstr ""
-#: ../stoqlib/lib/invoice.py:764
+#: ../stoqlib/lib/invoice.py:767
msgid "Product item unit"
msgstr ""
-#: ../stoqlib/lib/invoice.py:777
+#: ../stoqlib/lib/invoice.py:780
msgid "Product item quantity"
msgstr ""
-#: ../stoqlib/lib/invoice.py:790
+#: ../stoqlib/lib/invoice.py:793
msgid "Product item price"
msgstr ""
-#: ../stoqlib/lib/invoice.py:803
+#: ../stoqlib/lib/invoice.py:806
msgid "Product item total (price * quantity)"
msgstr ""
-#: ../stoqlib/lib/invoice.py:816
+#: ../stoqlib/lib/invoice.py:819
msgid "Product item tax"
msgstr ""
-#: ../stoqlib/lib/invoice.py:834
+#: ../stoqlib/lib/invoice.py:837
msgid "Invoice Type"
msgstr ""
-#: ../stoqlib/lib/invoice.py:855
+#: ../stoqlib/lib/invoice.py:858
msgid "State registry number"
msgstr ""
@@ -2338,23 +2211,23 @@
msgid "You need to have a State Registry set on Company %s"
msgstr ""
-#: ../stoqlib/lib/defaults.py:58 ../stoqlib/domain/product.py:111
+#: ../stoqlib/lib/defaults.py:59 ../stoqlib/domain/product.py:111
msgid "Days"
msgstr ""
-#: ../stoqlib/lib/defaults.py:59
+#: ../stoqlib/lib/defaults.py:60
msgid "Weeks"
msgstr ""
-#: ../stoqlib/lib/defaults.py:60
+#: ../stoqlib/lib/defaults.py:61
msgid "Months"
msgstr ""
-#: ../stoqlib/lib/defaults.py:61
+#: ../stoqlib/lib/defaults.py:62
msgid "Years"
msgstr ""
-#: ../stoqlib/lib/defaults.py:155
+#: ../stoqlib/lib/defaults.py:156
msgid "All branches"
msgstr ""
@@ -2655,6 +2528,13 @@
msgid "Layout"
msgstr ""
+#: ../stoqlib/gui/editors/personeditor.py:57
+#: ../stoqlib/gui/search/salesearch.py:72
+#: ../stoqlib/gui/search/salesearch.py:129
+#: ../stoqlib/gui/dialogs/productstockdetails.py:149
+msgid "Client"
+msgstr ""
+
#: ../stoqlib/gui/editors/personeditor.py:58
msgid "New Client"
msgstr ""
@@ -2711,6 +2591,18 @@
msgid "Role Name:"
msgstr ""
+#: ../stoqlib/gui/editors/personeditor.py:249
+#: ../stoqlib/gui/editors/producteditor.py:370
+#: ../stoqlib/gui/editors/producteditor.py:390
+#: ../stoqlib/gui/search/receivingsearch.py:81
+#: ../stoqlib/gui/wizards/receivingwizard.py:103
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:184
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:354
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:470
+#: ../stoqlib/gui/dialogs/productstockdetails.py:133
+msgid "Supplier"
+msgstr ""
+
#: ../stoqlib/gui/editors/personeditor.py:250
msgid "New Supplier"
msgstr ""
@@ -2723,6 +2615,11 @@
msgid "New Transporter"
msgstr ""
+#: ../stoqlib/gui/editors/personeditor.py:297
+#: ../stoqlib/gui/search/stationsearch.py:63 ../stoqlib/gui/base/search.py:353
+msgid "Branch"
+msgstr ""
+
#: ../stoqlib/gui/editors/personeditor.py:298
msgid "New Branch"
msgstr ""
@@ -2737,10 +2634,10 @@
#: ../stoqlib/gui/editors/categoryeditor.py:94
#: ../stoqlib/gui/editors/producteditor.py:126
-#: ../stoqlib/gui/search/productsearch.py:152
-#: ../stoqlib/gui/search/productsearch.py:273
+#: ../stoqlib/gui/search/productsearch.py:154
+#: ../stoqlib/gui/search/productsearch.py:275
#: ../stoqlib/gui/wizards/salequotewizard.py:171
-#: ../stoqlib/gui/wizards/purchasewizard.py:237
+#: ../stoqlib/gui/wizards/purchasewizard.py:243
#: ../stoqlib/gui/dialogs/paymentcategorydialog.py:50
msgid "Category"
msgstr ""
@@ -2782,41 +2679,70 @@
msgid "This unit type requires weighing"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:324
+#: ../stoqlib/gui/editors/sellableeditor.py:241
+msgid "Do you really want to delete?"
+msgstr ""
+
+#: ../stoqlib/gui/editors/sellableeditor.py:242
+#: ../stoqlib/gui/editors/parameterseditor.py:108
+#: ../stoqlib/gui/search/parametersearch.py:92
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
+#: ../stoqlib/gui/wizards/personwizard.py:97
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:392
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:498
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:537
+#: ../stoqlib/gui/dialogs/productstockdetails.py:183
+#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
+msgid "Yes"
+msgstr ""
+
+#: ../stoqlib/gui/editors/sellableeditor.py:242
+#: ../stoqlib/gui/editors/parameterseditor.py:114
+#: ../stoqlib/gui/search/parametersearch.py:92
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:392
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:498
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:537
+#: ../stoqlib/gui/dialogs/productstockdetails.py:183
+#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
+msgid "No"
+msgstr ""
+
+#: ../stoqlib/gui/editors/sellableeditor.py:337
msgid "No unit"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:327
+#: ../stoqlib/gui/editors/sellableeditor.py:340
msgid "Specify:"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:385
+#: ../stoqlib/gui/editors/sellableeditor.py:398
msgid "The code can not be empty."
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:387
+#: ../stoqlib/gui/editors/sellableeditor.py:400
#, python-format
msgid "The code %s already exists."
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:393
+#: ../stoqlib/gui/editors/sellableeditor.py:406
msgid "Barcode must have 14 digits or less."
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:395
+#: ../stoqlib/gui/editors/sellableeditor.py:408
#, python-format
msgid "The barcode %s already exists"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:399
+#: ../stoqlib/gui/editors/sellableeditor.py:412
msgid "Price cannot be zero or negative"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:403
+#: ../stoqlib/gui/editors/sellableeditor.py:416
msgid "Cost cannot be zero or negative"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:408
+#: ../stoqlib/gui/editors/sellableeditor.py:421
msgid "Unit must have a description"
msgstr ""
@@ -2832,7 +2758,7 @@
msgstr ""
#: ../stoqlib/gui/editors/serviceeditor.py:78
-#: ../stoqlib/gui/wizards/purchasewizard.py:495
+#: ../stoqlib/gui/wizards/purchasewizard.py:505
msgid "Expected receival date must be set to a future date"
msgstr ""
@@ -2845,29 +2771,6 @@
msgid "Cat 52 directory selection"
msgstr ""
-#: ../stoqlib/gui/editors/parameterseditor.py:108
-#: ../stoqlib/gui/search/parametersearch.py:92
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
-#: ../stoqlib/gui/wizards/personwizard.py:97
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:390
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:495
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:534
-#: ../stoqlib/gui/dialogs/productstockdetails.py:183
-#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
-msgid "Yes"
-msgstr ""
-
-#: ../stoqlib/gui/editors/parameterseditor.py:114
-#: ../stoqlib/gui/search/parametersearch.py:92
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:390
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:495
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:534
-#: ../stoqlib/gui/dialogs/productstockdetails.py:183
-#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
-msgid "No"
-msgstr ""
-
#: ../stoqlib/gui/editors/parameterseditor.py:128
#, python-format
msgid "Edit '%s' Parameter"
@@ -3007,9 +2910,8 @@
msgstr ""
#: ../stoqlib/gui/editors/producteditor.py:458
-#: ../stoqlib/gui/editors/producteditor.py:508
-#: ../stoqlib/gui/editors/producteditor.py:518
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:247
+#: ../stoqlib/gui/editors/producteditor.py:509
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:248
#: ../data/glade/SellableTypeStep.glade.h:2
#: ../data/glade/SellableEditor.glade.h:10
msgid "Product"
@@ -3083,7 +2985,7 @@
#: ../stoqlib/gui/dialogs/devices.py:54 ../stoqlib/domain/station.py:102
#: ../stoqlib/domain/devices.py:155 ../stoqlib/domain/person.py:373
#: ../stoqlib/domain/person.py:590 ../stoqlib/domain/person.py:668
-#: ../stoqlib/domain/person.py:700 ../stoqlib/domain/person.py:1059
+#: ../stoqlib/domain/person.py:700 ../stoqlib/domain/person.py:1060
#: ../stoqlib/domain/test/test_person.py:510
#: ../stoqlib/domain/test/test_person.py:519
#: ../stoqlib/domain/payment/method.py:147
@@ -3095,52 +2997,52 @@
msgid "Active"
msgstr ""
-#: ../stoqlib/gui/search/servicesearch.py:48
+#: ../stoqlib/gui/search/servicesearch.py:49
msgid "Service Search"
msgstr ""
-#: ../stoqlib/gui/search/servicesearch.py:54
+#: ../stoqlib/gui/search/servicesearch.py:55
msgid "Add services"
msgstr ""
-#: ../stoqlib/gui/search/servicesearch.py:55
+#: ../stoqlib/gui/search/servicesearch.py:56
msgid "service"
msgstr ""
-#: ../stoqlib/gui/search/servicesearch.py:67
+#: ../stoqlib/gui/search/servicesearch.py:68
#: ../stoqlib/gui/search/personsearch.py:311
-#: ../stoqlib/gui/search/productsearch.py:89
+#: ../stoqlib/gui/search/productsearch.py:90
msgid "matching"
msgstr ""
-#: ../stoqlib/gui/search/servicesearch.py:73
-#: ../stoqlib/gui/search/productsearch.py:97
+#: ../stoqlib/gui/search/servicesearch.py:74
+#: ../stoqlib/gui/search/productsearch.py:98
msgid "_Table of Price"
msgstr ""
#. if not items:
#. raise ValueError('You should have at least one branch at '
#. 'this point')
-#: ../stoqlib/gui/search/servicesearch.py:90
+#: ../stoqlib/gui/search/servicesearch.py:91
#: ../stoqlib/gui/search/personsearch.py:91
#: ../stoqlib/gui/search/personsearch.py:97
#: ../stoqlib/gui/search/personsearch.py:223
#: ../stoqlib/gui/search/personsearch.py:262
#: ../stoqlib/gui/search/personsearch.py:322
-#: ../stoqlib/gui/search/productsearch.py:134
+#: ../stoqlib/gui/search/productsearch.py:135
#: ../stoqlib/gui/search/salesearch.py:62
#: ../stoqlib/gui/search/tillsearch.py:105
-#: ../stoqlib/gui/search/paymentsearch.py:55 ../stoqlib/gui/base/search.py:300
+#: ../stoqlib/gui/search/paymentsearch.py:55 ../stoqlib/gui/base/search.py:350
msgid "Any"
msgstr ""
-#: ../stoqlib/gui/search/servicesearch.py:91
+#: ../stoqlib/gui/search/servicesearch.py:92
msgid "Show services with status"
msgstr ""
-#: ../stoqlib/gui/search/servicesearch.py:108
-#: ../stoqlib/gui/search/productsearch.py:150
-#: ../stoqlib/gui/search/sellablesearch.py:120
+#: ../stoqlib/gui/search/servicesearch.py:109
+#: ../stoqlib/gui/search/productsearch.py:152
+#: ../stoqlib/gui/search/sellablesearch.py:122
msgid "Barcode"
msgstr ""
@@ -3187,6 +3089,22 @@
msgid "Registry Number"
msgstr ""
+#: ../stoqlib/gui/search/personsearch.py:116
+#: ../stoqlib/gui/search/personsearch.py:336
+#: ../stoqlib/gui/search/paymentsearch.py:82
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:133
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:92
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:131
+#: ../stoqlib/gui/dialogs/saledetails.py:152
+#: ../stoqlib/gui/dialogs/clientdetails.py:129
+#: ../stoqlib/gui/dialogs/clientdetails.py:164
+#: ../stoqlib/gui/dialogs/supplierdetails.py:123
+#: ../stoqlib/gui/dialogs/supplierdetails.py:149
+#: ../stoqlib/gui/dialogs/purchasedetails.py:177
+#: ../stoqlib/domain/payment/views.py:262
+msgid "Status"
+msgstr ""
+
#: ../stoqlib/gui/search/personsearch.py:125
msgid "Supplier Search"
msgstr ""
@@ -3277,7 +3195,7 @@
#: ../stoqlib/domain/devices.py:156 ../stoqlib/domain/person.py:374
#: ../stoqlib/domain/person.py:499 ../stoqlib/domain/person.py:591
#: ../stoqlib/domain/person.py:669 ../stoqlib/domain/person.py:701
-#: ../stoqlib/domain/person.py:1061 ../stoqlib/domain/test/test_person.py:462
+#: ../stoqlib/domain/person.py:1062 ../stoqlib/domain/test/test_person.py:462
#: ../stoqlib/domain/test/test_person.py:473
#: ../stoqlib/domain/payment/method.py:148 ../plugins/ecf/ecfdomain.py:205
#: ../data/glade/BranchDetailsSlave.glade.h:3
@@ -3386,15 +3304,30 @@
msgid "ISS Total:"
msgstr ""
+#: ../stoqlib/gui/search/fiscalsearch.py:123
+#: ../stoqlib/gui/search/commissionsearch.py:81
+#: ../stoqlib/gui/search/tillsearch.py:116
+#: ../stoqlib/gui/dialogs/tillhistory.py:63
+#: ../stoqlib/gui/dialogs/clientdetails.py:125
+#: ../stoqlib/gui/dialogs/supplierdetails.py:121
+#: ../stoqlib/gui/dialogs/productstockdetails.py:129
+#: ../data/glade/FiscalMemoryEditor.glade.h:2
+msgid "Date"
+msgstr ""
+
#: ../stoqlib/gui/search/fiscalsearch.py:125
#: ../stoqlib/gui/dialogs/productstockdetails.py:135
msgid "Invoice"
msgstr ""
+#: ../stoqlib/gui/search/fiscalsearch.py:128
+msgid "Drawee"
+msgstr ""
+
#. Branch
#: ../stoqlib/gui/search/fiscalsearch.py:151
-#: ../stoqlib/gui/search/productsearch.py:127
-#: ../stoqlib/gui/search/productsearch.py:216
+#: ../stoqlib/gui/search/productsearch.py:128
+#: ../stoqlib/gui/search/productsearch.py:218
#: ../stoqlib/gui/search/purchasesearch.py:63
msgid "In branch:"
msgstr ""
@@ -3477,8 +3410,8 @@
#. Date
#: ../stoqlib/gui/search/transfersearch.py:85
-#: ../stoqlib/gui/search/productsearch.py:211
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:341
+#: ../stoqlib/gui/search/productsearch.py:213
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:343
#: ../stoqlib/gui/dialogs/tillhistory.py:75
#: ../data/glade/EmployeeDetailsSlave.glade.h:7
#: ../data/glade/ProductsAdjustment.glade.h:3
@@ -3488,7 +3421,7 @@
msgstr ""
#: ../stoqlib/gui/search/transfersearch.py:90
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:354
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:356
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:144
msgid "Open Date"
msgstr ""
@@ -3506,37 +3439,37 @@
msgid "Number of items transferred"
msgstr ""
-#: ../stoqlib/gui/search/productsearch.py:57
+#: ../stoqlib/gui/search/productsearch.py:58
msgid "Product Search"
msgstr ""
-#: ../stoqlib/gui/search/productsearch.py:62
+#: ../stoqlib/gui/search/productsearch.py:63
msgid "Add products"
msgstr ""
-#: ../stoqlib/gui/search/productsearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:249
+#: ../stoqlib/gui/search/productsearch.py:64
+#: ../stoqlib/gui/search/productsearch.py:251
msgid "product"
msgstr ""
-#: ../stoqlib/gui/search/productsearch.py:135
+#: ../stoqlib/gui/search/productsearch.py:136
msgid "with status:"
msgstr ""
-#: ../stoqlib/gui/search/productsearch.py:156
-#: ../stoqlib/gui/search/productsearch.py:277
+#: ../stoqlib/gui/search/productsearch.py:158
+#: ../stoqlib/gui/search/productsearch.py:279
msgid "Location"
msgstr ""
-#: ../stoqlib/gui/search/productsearch.py:194
+#: ../stoqlib/gui/search/productsearch.py:196
msgid "Product History Search"
msgstr ""
-#: ../stoqlib/gui/search/productsearch.py:244
+#: ../stoqlib/gui/search/productsearch.py:246
msgid "Product Stock Search"
msgstr ""
-#: ../stoqlib/gui/search/productsearch.py:288
+#: ../stoqlib/gui/search/productsearch.py:290
msgid "Difference"
msgstr ""
@@ -3548,18 +3481,52 @@
msgid "Show sales with status"
msgstr ""
+#: ../stoqlib/gui/search/salesearch.py:68
+#: ../stoqlib/gui/search/paymentsearch.py:76
+#: ../stoqlib/gui/wizards/receivingwizard.py:97
+#: ../stoqlib/gui/dialogs/tillhistory.py:61
+msgid "Number"
+msgstr ""
+
#: ../stoqlib/gui/search/salesearch.py:70
-#: ../stoqlib/gui/wizards/receivingwizard.py:98
+#: ../stoqlib/gui/wizards/receivingwizard.py:99
#: ../stoqlib/gui/dialogs/productstockdetails.py:146
msgid "Date Started"
msgstr ""
+#: ../stoqlib/gui/search/salesearch.py:75
+#: ../stoqlib/gui/search/commissionsearch.py:71
+#: ../stoqlib/gui/dialogs/clientdetails.py:127
+msgid "Salesperson"
+msgstr ""
+
#: ../stoqlib/gui/search/salesearch.py:77
-#: ../data/glade/SaleDetailsDialog.glade.h:6
+#: ../data/glade/SaleDetailsDialog.glade.h:7
#: ../data/glade/RenegotiationDetailsDialog.glade.h:6
msgid "Items"
msgstr ""
+#: ../stoqlib/gui/search/salesearch.py:115
+msgid "Delivery Search"
+msgstr ""
+
+#: ../stoqlib/gui/search/salesearch.py:122
+msgid "Items matching:"
+msgstr ""
+
+#: ../stoqlib/gui/search/salesearch.py:125
+#: ../stoqlib/gui/search/purchasesearch.py:76
+msgid "# "
+msgstr ""
+
+#: ../stoqlib/gui/search/salesearch.py:132
+msgid "Estimated Date"
+msgstr ""
+
+#: ../stoqlib/gui/search/salesearch.py:134
+msgid "Completion Date"
+msgstr ""
+
#: ../stoqlib/gui/search/commissionsearch.py:46
msgid "Search for Commissions"
msgstr ""
@@ -3610,12 +3577,12 @@
msgid "Receival Date"
msgstr ""
-#: ../stoqlib/gui/search/purchasesearch.py:43
-msgid "Purchased Items Search"
+#: ../stoqlib/gui/search/receivingsearch.py:83
+msgid "Invoice #"
msgstr ""
-#: ../stoqlib/gui/search/purchasesearch.py:76
-msgid "# "
+#: ../stoqlib/gui/search/purchasesearch.py:43
+msgid "Purchased Items Search"
msgstr ""
#: ../stoqlib/gui/search/purchasesearch.py:80
@@ -3630,23 +3597,23 @@
msgid "Expected receival"
msgstr ""
-#: ../stoqlib/gui/search/sellablesearch.py:50
+#: ../stoqlib/gui/search/sellablesearch.py:51
msgid "Search for sale items"
msgstr ""
-#: ../stoqlib/gui/search/sellablesearch.py:55
+#: ../stoqlib/gui/search/sellablesearch.py:56
msgid "_Add sale items"
msgstr ""
-#: ../stoqlib/gui/search/sellablesearch.py:56
+#: ../stoqlib/gui/search/sellablesearch.py:57
msgid "sale item"
msgstr ""
-#: ../stoqlib/gui/search/sellablesearch.py:56
+#: ../stoqlib/gui/search/sellablesearch.py:57
msgid "sale items"
msgstr ""
-#: ../stoqlib/gui/search/sellablesearch.py:84
+#: ../stoqlib/gui/search/sellablesearch.py:85
msgid "Show items matching:"
msgstr ""
@@ -3671,7 +3638,7 @@
msgstr ""
#: ../stoqlib/gui/search/parametersearch.py:68
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:350
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:352
msgid "Group"
msgstr ""
@@ -3691,18 +3658,26 @@
msgid "Bill or check number:"
msgstr ""
+#: ../stoqlib/gui/search/paymentsearch.py:70
+msgid "Bank"
+msgstr ""
+
#: ../stoqlib/gui/search/paymentsearch.py:72
msgid "Branch Number"
msgstr ""
+#: ../stoqlib/gui/search/paymentsearch.py:74
+msgid "Account"
+msgstr ""
+
#: ../stoqlib/gui/search/paymentsearch.py:78
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:128
#: ../stoqlib/gui/wizards/renegotiationwizard.py:90
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:126
-#: ../stoqlib/gui/dialogs/saledetails.py:154
+#: ../stoqlib/gui/dialogs/saledetails.py:147
#: ../stoqlib/gui/dialogs/clientdetails.py:162
#: ../stoqlib/gui/dialogs/supplierdetails.py:147
-#: ../stoqlib/gui/dialogs/purchasedetails.py:189
+#: ../stoqlib/gui/dialogs/purchasedetails.py:172
#: ../stoqlib/gui/slaves/paymentslave.py:1038
#: ../stoqlib/domain/payment/views.py:260
msgid "Due Date"
@@ -3711,8 +3686,8 @@
#: ../stoqlib/gui/search/paymentsearch.py:80
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:131
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:129
-#: ../stoqlib/gui/dialogs/saledetails.py:157
-#: ../stoqlib/gui/dialogs/purchasedetails.py:192
+#: ../stoqlib/gui/dialogs/saledetails.py:150
+#: ../stoqlib/gui/dialogs/purchasedetails.py:175
msgid "Paid Date"
msgstr ""
@@ -3731,8 +3706,8 @@
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:138
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:136
-#: ../stoqlib/gui/dialogs/saledetails.py:164
-#: ../stoqlib/gui/dialogs/purchasedetails.py:200
+#: ../stoqlib/gui/dialogs/saledetails.py:157
+#: ../stoqlib/gui/dialogs/purchasedetails.py:183
msgid "Paid Value"
msgstr ""
@@ -3763,12 +3738,6 @@
msgid "Client %s does not have enought credit left."
msgstr ""
-#: ../stoqlib/gui/wizards/salewizard.py:359
-#: ../stoqlib/gui/wizards/salequotewizard.py:128
-#: ../stoqlib/gui/slaves/receivingslave.py:119
-msgid "Additional Information"
-msgstr ""
-
#: ../stoqlib/gui/wizards/salewizard.py:371
msgid "Sale Checkout"
msgstr ""
@@ -3803,7 +3772,7 @@
msgstr ""
#: ../stoqlib/gui/wizards/salequotewizard.py:135
-#: ../stoqlib/gui/wizards/purchasewizard.py:175
+#: ../stoqlib/gui/wizards/purchasewizard.py:181
msgid "Total Ordered:"
msgstr ""
@@ -3823,44 +3792,48 @@
msgid "Expected receival date must be set to today or a future date"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:241
-#: ../stoqlib/gui/wizards/receivingwizard.py:101
+#: ../stoqlib/gui/wizards/purchasewizard.py:173
+msgid "The expected freight value must be a positive number."
+msgstr ""
+
+#: ../stoqlib/gui/wizards/purchasewizard.py:247
+#: ../stoqlib/gui/wizards/receivingwizard.py:102
msgid "Expected Receival"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:303
+#: ../stoqlib/gui/wizards/purchasewizard.py:309
msgid "The cost must be greater than zero."
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:307
+#: ../stoqlib/gui/wizards/purchasewizard.py:313
msgid "Quantity must be greater than zero"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:311
+#: ../stoqlib/gui/wizards/purchasewizard.py:317
msgid "Quantity below the minimum required by the supplier"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:332
+#: ../stoqlib/gui/wizards/purchasewizard.py:338
#: ../stoqlib/domain/payment/operation.py:115
msgid "Bill"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:333
+#: ../stoqlib/gui/wizards/purchasewizard.py:339
#: ../stoqlib/domain/payment/operation.py:73
msgid "Check"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:334
+#: ../stoqlib/gui/wizards/purchasewizard.py:340
#: ../stoqlib/domain/payment/operation.py:50
#: ../data/glade/BasePaymentAddition.glade.h:4
msgid "Money"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:541
+#: ../stoqlib/gui/wizards/purchasewizard.py:551
msgid "New Order"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:542
+#: ../stoqlib/gui/wizards/purchasewizard.py:552
msgid "Edit Order"
msgstr ""
@@ -3888,87 +3861,87 @@
msgid "Adding a %s"
msgstr ""
-#: ../stoqlib/gui/wizards/receivingwizard.py:105
+#: ../stoqlib/gui/wizards/receivingwizard.py:106
msgid "Qty Ordered"
msgstr ""
-#: ../stoqlib/gui/wizards/receivingwizard.py:111
+#: ../stoqlib/gui/wizards/receivingwizard.py:112
msgid "Order Total"
msgstr ""
-#: ../stoqlib/gui/wizards/receivingwizard.py:203
+#: ../stoqlib/gui/wizards/receivingwizard.py:205
#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:4
msgid "Total Received:"
msgstr ""
-#: ../stoqlib/gui/wizards/receivingwizard.py:247
+#: ../stoqlib/gui/wizards/receivingwizard.py:249
msgid "Quantity to receive"
msgstr ""
-#: ../stoqlib/gui/wizards/receivingwizard.py:291
+#: ../stoqlib/gui/wizards/receivingwizard.py:299
msgid "Receiving Order"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:110
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:111
msgid "The quote deadline date must be set to today or a future date"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:177
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:178
msgid ""
"No supplier have been found for any of the selected items.\n"
"This quote will be cancelled."
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:185
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:186
msgid "Supplied/Total"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:215
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:216
#, python-format
msgid "%s/%s"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:253
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:254
#, python-format
msgid "Products supplied by %s"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:267
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:268
msgid "Missing Products"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:348
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:350
msgid "Quote"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:356
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:358
msgid "Deadline"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:389
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:391
#, python-format
msgid "Are you sure you want to remove \"%s\" ?"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:493
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:496
msgid ""
"Are you sure you want to cancel this group ? If so, note that all the quotes "
"will be cancelled."
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:532
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:535
msgid "Should we close the quotes used to compose the purchase order ?"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:612
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:615
msgid "New Quote"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:613
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:616
msgid "Edit Quote"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:652
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:655
msgid "Receive Quote Wizard"
msgstr ""
@@ -4021,8 +3994,8 @@
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:52
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:212
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:151
-#: ../stoqlib/gui/dialogs/saledetails.py:183
-#: ../stoqlib/gui/dialogs/purchasedetails.py:209
+#: ../stoqlib/gui/dialogs/saledetails.py:176
+#: ../stoqlib/gui/dialogs/purchasedetails.py:192
#: ../stoqlib/gui/slaves/paymentslave.py:903 ../plugins/ecf/ecfdomain.py:250
msgid "Payment"
msgstr ""
@@ -4042,37 +4015,37 @@
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:210
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:149
-#: ../stoqlib/gui/dialogs/saledetails.py:181
-#: ../stoqlib/gui/dialogs/purchasedetails.py:207
+#: ../stoqlib/gui/dialogs/saledetails.py:174
+#: ../stoqlib/gui/dialogs/purchasedetails.py:190
#: ../stoqlib/gui/dialogs/productstockdetails.py:174
msgid "When"
msgstr ""
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:215
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:154
-#: ../stoqlib/gui/dialogs/saledetails.py:186
-#: ../stoqlib/gui/dialogs/purchasedetails.py:212
+#: ../stoqlib/gui/dialogs/saledetails.py:179
+#: ../stoqlib/gui/dialogs/purchasedetails.py:195
msgid "Changed"
msgstr ""
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:217
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:156
-#: ../stoqlib/gui/dialogs/saledetails.py:188
-#: ../stoqlib/gui/dialogs/purchasedetails.py:214
+#: ../stoqlib/gui/dialogs/saledetails.py:181
+#: ../stoqlib/gui/dialogs/purchasedetails.py:197
msgid "From"
msgstr ""
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:219
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:158
-#: ../stoqlib/gui/dialogs/saledetails.py:190
-#: ../stoqlib/gui/dialogs/purchasedetails.py:216
+#: ../stoqlib/gui/dialogs/saledetails.py:183
+#: ../stoqlib/gui/dialogs/purchasedetails.py:199
msgid "To"
msgstr ""
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:221
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:160
-#: ../stoqlib/gui/dialogs/saledetails.py:192
-#: ../stoqlib/gui/dialogs/purchasedetails.py:218
+#: ../stoqlib/gui/dialogs/saledetails.py:185
+#: ../stoqlib/gui/dialogs/purchasedetails.py:201
#: ../stoqlib/gui/dialogs/productstockdetails.py:176
msgid "Reason"
msgstr ""
@@ -4086,15 +4059,15 @@
msgid "Payment Details"
msgstr ""
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:42
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:44
msgid "CSV Exporter Dialog"
msgstr ""
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:90
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:92
msgid "Export CSV..."
msgstr ""
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:97
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:99
msgid "CSV Files"
msgstr ""
@@ -4277,7 +4250,7 @@
msgstr ""
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:122
-#: ../stoqlib/gui/dialogs/saledetails.py:150
+#: ../stoqlib/gui/dialogs/saledetails.py:143
#: ../stoqlib/gui/dialogs/clientdetails.py:157
#: ../stoqlib/gui/dialogs/supplierdetails.py:142
msgid "Type"
@@ -4314,7 +4287,7 @@
msgid "Sale Details"
msgstr ""
-#: ../stoqlib/gui/dialogs/saledetails.py:232
+#: ../stoqlib/gui/dialogs/saledetails.py:227
msgid "Sale Cancellation Details"
msgstr ""
@@ -4373,7 +4346,7 @@
msgid "Purchase Details"
msgstr ""
-#: ../stoqlib/gui/dialogs/purchasedetails.py:174
+#: ../stoqlib/gui/dialogs/purchasedetails.py:157
msgid "Quantity Received"
msgstr ""
@@ -4401,31 +4374,31 @@
msgid "Notification"
msgstr ""
-#: ../stoqlib/gui/base/search.py:157
+#: ../stoqlib/gui/base/search.py:204
msgid "Se_lect Items"
msgstr ""
-#: ../stoqlib/gui/base/search.py:607
+#: ../stoqlib/gui/base/search.py:657
msgid "This week"
msgstr ""
-#: ../stoqlib/gui/base/search.py:619
+#: ../stoqlib/gui/base/search.py:669
msgid "Last Week"
msgstr ""
-#: ../stoqlib/gui/base/search.py:631
+#: ../stoqlib/gui/base/search.py:681
msgid "Next week"
msgstr ""
-#: ../stoqlib/gui/base/search.py:642
+#: ../stoqlib/gui/base/search.py:692
msgid "This month"
msgstr ""
-#: ../stoqlib/gui/base/search.py:652
+#: ../stoqlib/gui/base/search.py:702
msgid "Last month"
msgstr ""
-#: ../stoqlib/gui/base/search.py:662
+#: ../stoqlib/gui/base/search.py:712
msgid "Next month"
msgstr ""
@@ -4470,19 +4443,19 @@
msgid "Sale price can not be 0"
msgstr ""
-#: ../stoqlib/gui/slaves/productslave.py:85
+#: ../stoqlib/gui/slaves/productslave.py:82
msgid "Minimum value must be a positive value."
msgstr ""
-#: ../stoqlib/gui/slaves/productslave.py:89
+#: ../stoqlib/gui/slaves/productslave.py:86
msgid "Minimum must be lower than the maximum value."
msgstr ""
-#: ../stoqlib/gui/slaves/productslave.py:96
+#: ../stoqlib/gui/slaves/productslave.py:93
msgid "Maximum value must be a positive value."
msgstr ""
-#: ../stoqlib/gui/slaves/productslave.py:100
+#: ../stoqlib/gui/slaves/productslave.py:97
msgid "Maximum must be greater than the minimum value."
msgstr ""
@@ -4502,63 +4475,67 @@
msgid "Select Image"
msgstr ""
-#: ../stoqlib/gui/slaves/receivingslave.py:123
+#: ../stoqlib/gui/slaves/receivingslave.py:129
msgid "Receving order number must be between 1 and 999999"
msgstr ""
-#: ../stoqlib/gui/slaves/receivingslave.py:131
+#: ../stoqlib/gui/slaves/receivingslave.py:137
#, python-format
msgid "Invoice %d already exists for supplier %s."
msgstr ""
-#: ../stoqlib/gui/slaves/receivingslave.py:136
+#: ../stoqlib/gui/slaves/receivingslave.py:142
msgid "This field cannot be negative"
msgstr ""
-#: ../stoqlib/gui/slaves/receivingslave.py:176
+#: ../stoqlib/gui/slaves/receivingslave.py:182
msgid "Discount must be greater than zero"
msgstr ""
-#: ../stoqlib/gui/slaves/receivingslave.py:178
+#: ../stoqlib/gui/slaves/receivingslave.py:184
#, python-format
msgid "Discount must be less than %s"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:188
+#: ../stoqlib/gui/slaves/installmentslave.py:204
msgid "Confirm payment"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:229
+#: ../stoqlib/gui/slaves/installmentslave.py:245
msgid "Due"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:232
+#: ../stoqlib/gui/slaves/installmentslave.py:246
+msgid "Paid date"
+msgstr ""
+
+#: ../stoqlib/gui/slaves/installmentslave.py:248
msgid "Paid value"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:287
+#: ../stoqlib/gui/slaves/installmentslave.py:309
#, python-format
msgid "Paid date must be between %s and today"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:297
+#: ../stoqlib/gui/slaves/installmentslave.py:319
msgid "Penalty can not be less than zero"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:306
+#: ../stoqlib/gui/slaves/installmentslave.py:328
msgid "Interest can not be less than zero"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:316
+#: ../stoqlib/gui/slaves/installmentslave.py:338
#, python-format
msgid "Discount can not be greater or equal than %.2f"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:319
+#: ../stoqlib/gui/slaves/installmentslave.py:341
msgid "Discount can not be less than zero"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:368
+#: ../stoqlib/gui/slaves/installmentslave.py:390
msgid "Supplier: "
msgstr ""
@@ -4808,11 +4785,16 @@
msgstr ""
#: ../stoqlib/domain/transfer.py:80 ../stoqlib/domain/purchase.py:145
-#: ../stoqlib/domain/sellable.py:251 ../stoqlib/domain/till.py:88
+#: ../stoqlib/domain/sellable.py:249 ../stoqlib/domain/till.py:88
#: ../stoqlib/domain/inventory.py:168 ../stoqlib/domain/payment/group.py:62
msgid "Closed"
msgstr ""
+#: ../stoqlib/domain/receiving.py:214
+#, python-format
+msgid "Freight for purchase %s"
+msgstr ""
+
#: ../stoqlib/domain/devices.py:66
msgid "Serial port 1"
msgstr ""
@@ -4837,80 +4819,100 @@
msgid "Day"
msgstr ""
-#: ../stoqlib/domain/purchase.py:141 ../stoqlib/domain/sale.py:277
-#: ../stoqlib/domain/inventory.py:169 ../stoqlib/domain/payment/payment.py:77
+#: ../stoqlib/domain/purchase.py:141 ../stoqlib/domain/sale.py:279
+#: ../stoqlib/domain/inventory.py:169 ../stoqlib/domain/payment/payment.py:79
#: ../stoqlib/domain/payment/group.py:63
msgid "Cancelled"
msgstr ""
-#: ../stoqlib/domain/purchase.py:142 ../stoqlib/domain/sale.py:281
+#: ../stoqlib/domain/purchase.py:142 ../stoqlib/domain/sale.py:283
msgid "Quoting"
msgstr ""
-#: ../stoqlib/domain/purchase.py:144 ../stoqlib/domain/sale.py:275
-#: ../stoqlib/domain/payment/payment.py:76
+#: ../stoqlib/domain/purchase.py:144 ../stoqlib/domain/sale.py:277
+#: ../stoqlib/domain/payment/payment.py:78
#: ../stoqlib/domain/payment/renegotiation.py:55
#: ../stoqlib/domain/payment/group.py:61
msgid "Confirmed"
msgstr ""
-#: ../stoqlib/domain/purchase.py:150 ../data/glade/StartPurchaseStep.glade.h:7
+#: ../stoqlib/domain/purchase.py:150 ../data/glade/StartPurchaseStep.glade.h:6
msgid "FOB"
msgstr ""
-#: ../stoqlib/domain/purchase.py:151 ../data/glade/StartPurchaseStep.glade.h:6
+#: ../stoqlib/domain/purchase.py:151 ../data/glade/StartPurchaseStep.glade.h:4
msgid "CIF"
msgstr ""
-#: ../stoqlib/domain/purchase.py:515
+#: ../stoqlib/domain/purchase.py:508
#, python-format
msgid "quote number %04d"
msgstr ""
-#: ../stoqlib/domain/purchase.py:569
+#: ../stoqlib/domain/purchase.py:562
#, python-format
msgid "%s Money Returned for Purchase %d"
msgstr ""
-#: ../stoqlib/domain/sale.py:274 ../stoqlib/domain/till.py:87
+#: ../stoqlib/domain/sale.py:276 ../stoqlib/domain/till.py:87
#: ../stoqlib/domain/inventory.py:167
msgid "Opened"
msgstr ""
-#: ../stoqlib/domain/sale.py:276 ../stoqlib/domain/payment/payment.py:74
+#: ../stoqlib/domain/sale.py:278 ../stoqlib/domain/payment/payment.py:76
#: ../stoqlib/domain/payment/renegotiation.py:56
msgid "Paid"
msgstr ""
-#: ../stoqlib/domain/sale.py:279
+#: ../stoqlib/domain/sale.py:281
msgid "Returned"
msgstr ""
-#: ../stoqlib/domain/sale.py:280 ../stoqlib/domain/payment/renegotiation.py:57
+#: ../stoqlib/domain/sale.py:282 ../stoqlib/domain/payment/renegotiation.py:57
msgid "Renegotiated"
msgstr ""
+#: ../stoqlib/domain/sale.py:550
+#, python-format
+msgid "Sale Details: %s"
+msgstr ""
+
+#: ../stoqlib/domain/sale.py:556
+#, python-format
+msgid "Delivery Address: %s"
+msgstr ""
+
+#: ../stoqlib/domain/sale.py:562
+#, python-format
+msgid "\"%s\" Notes: %s"
+msgstr ""
+
+#: ../stoqlib/domain/sale.py:565
+#, python-format
+msgid "\"%s\" Estimated Fix Date: %s"
+msgstr ""
+
#. The sale was not entirely paid, so we have to payback the
#. till, because the sale amount have already been added in there
-#: ../stoqlib/domain/sale.py:826
+#: ../stoqlib/domain/sale.py:845
#, python-format
msgid "Debit on Till: Sale %d Returned"
msgstr ""
-#: ../stoqlib/domain/sale.py:836
+#: ../stoqlib/domain/sale.py:855
#, python-format
msgid "%s Money Returned for Sale %d"
msgstr ""
-#: ../stoqlib/domain/sellable.py:249
+#: ../stoqlib/domain/sellable.py:247
msgid "Available"
msgstr ""
-#: ../stoqlib/domain/sellable.py:252 ../stoqlib/domain/person.py:592
+#: ../stoqlib/domain/sellable.py:250 ../stoqlib/domain/person.py:592
msgid "Blocked"
msgstr ""
-#: ../stoqlib/domain/sellable.py:541
+#: ../stoqlib/domain/sellable.py:565
#, python-format
msgid ""
"The sellable with barcode '%s' doesn't exists or is not available to be sold"
@@ -5049,20 +5051,20 @@
msgid "Multiple"
msgstr ""
-#: ../stoqlib/domain/payment/payment.py:72
+#: ../stoqlib/domain/payment/payment.py:74
#: ../stoqlib/domain/payment/group.py:60
msgid "Preview"
msgstr ""
-#: ../stoqlib/domain/payment/payment.py:73
+#: ../stoqlib/domain/payment/payment.py:75
msgid "To Pay"
msgstr ""
-#: ../stoqlib/domain/payment/payment.py:75
+#: ../stoqlib/domain/payment/payment.py:77
msgid "Reviewing"
msgstr ""
-#: ../stoqlib/domain/payment/payment.py:301
+#: ../stoqlib/domain/payment/payment.py:304
msgid "NOT PAID"
msgstr ""
@@ -5091,17 +5093,17 @@
msgid "%s/%s %s for %s"
msgstr ""
-#: ../stoqlib/domain/payment/group.py:206
+#: ../stoqlib/domain/payment/group.py:212
#, python-format
msgid "sale %s"
msgstr ""
-#: ../stoqlib/domain/payment/group.py:208
+#: ../stoqlib/domain/payment/group.py:214
#, python-format
msgid "order %s"
msgstr ""
-#: ../stoqlib/domain/payment/group.py:210
+#: ../stoqlib/domain/payment/group.py:216
#, python-format
msgid "renegotiation %s"
msgstr ""
@@ -5308,9 +5310,9 @@
msgstr ""
#: ../plugins/ecf/deviceconstanteditor.py:205
-#: ../data/glade/SaleDetailsDialog.glade.h:9
+#: ../data/glade/SaleDetailsDialog.glade.h:10
#: ../data/glade/RenegotiationDetailsDialog.glade.h:9
-#: ../data/glade/PurchaseDetailsDialog.glade.h:17
+#: ../data/glade/PurchaseDetailsDialog.glade.h:16
#: ../data/glade/ClientDetailsDialog.glade.h:4
#: ../data/glade/SupplierDetailsDialog.glade.h:3
msgid "Payments"
@@ -5478,8 +5480,6 @@
#: ../data/glade/SaleDiscountSlave.glade.h:2
#: ../data/glade/TributarySituationSlave.glade.h:2
#: ../data/glade/SellablePriceEditor.glade.h:2
-#: ../data/glade/PurchaseDetailsDialog.glade.h:2
-#: ../data/glade/StartPurchaseStep.glade.h:2
#: ../data/glade/PaymentMethodEditor.glade.h:2
#: ../data/glade/ProductSupplierEditor.glade.h:2
#: ../data/glade/SellableCategoryDataSlave.glade.h:2
@@ -5552,7 +5552,6 @@
#: ../data/glade/SalesPersonStep.glade.h:1
#: ../data/glade/ProductAdjustmentDialog.glade.h:1
#: ../data/glade/SellablePriceEditor.glade.h:6
-#: ../data/glade/StartPurchaseStep.glade.h:3
#: ../data/glade/PaymentMethodEditor.glade.h:4
#: ../data/glade/ProductSupplierEditor.glade.h:3
#: ../data/glade/PurchasePaymentStep.glade.h:1
@@ -5571,7 +5570,7 @@
msgstr ""
#: ../data/glade/SalesPersonStep.glade.h:5
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:9
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:12
msgid "Notes..."
msgstr ""
@@ -5580,13 +5579,13 @@
msgstr ""
#: ../data/glade/SalesPersonStep.glade.h:7
-#: ../data/glade/SaleDetailsDialog.glade.h:10
+#: ../data/glade/SaleDetailsDialog.glade.h:12
#: ../data/glade/PurchaseDetailsDialog.glade.h:19
msgid "Salesperson:"
msgstr ""
#: ../data/glade/SalesPersonStep.glade.h:8
-#: ../data/glade/SaleDetailsDialog.glade.h:12
+#: ../data/glade/SaleDetailsDialog.glade.h:14
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:4
#: ../data/glade/RenegotiationDetailsDialog.glade.h:12
#: ../data/glade/PurchaseDetailsDialog.glade.h:20
@@ -5600,24 +5599,44 @@
#: ../data/glade/SaleDetailsDialog.glade.h:2
#: ../data/glade/RenegotiationDetailsDialog.glade.h:2
-#: ../data/glade/PurchaseDetailsDialog.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:3
msgid "Changes"
msgstr ""
-#: ../data/glade/SaleDetailsDialog.glade.h:7
+#: ../data/glade/SaleDetailsDialog.glade.h:6
+#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:8
+#: ../data/glade/PaymentMethodEditor.glade.h:7
+msgid "Interest:"
+msgstr ""
+
+#: ../data/glade/SaleDetailsDialog.glade.h:8
#: ../data/glade/RenegotiationDetailsDialog.glade.h:7
#: ../data/glade/FinishPurchaseStep.glade.h:3
#: ../data/glade/ReceivingOrderDetailsDialog.glade.h:1
msgid "Notes"
msgstr ""
-#: ../data/glade/SaleDetailsDialog.glade.h:13
+#: ../data/glade/SaleDetailsDialog.glade.h:11
+#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:8
+#: ../data/glade/PurchaseDetailsDialog.glade.h:17
+msgid "Penalty:"
+msgstr ""
+
+#: ../data/glade/SaleDetailsDialog.glade.h:15
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:5
#: ../data/glade/RenegotiationDetailsDialog.glade.h:13
#: ../data/glade/PurchaseDetailsDialog.glade.h:22
msgid "Surcharge:"
msgstr ""
+#: ../data/glade/SaleDetailsDialog.glade.h:16
+#: ../data/glade/PurchaseDetailsDialog.glade.h:23
+#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:3
+#: ../data/glade/SaleReturnSlave.glade.h:11
+msgid "Total Paid:"
+msgstr ""
+
#: ../data/glade/QuoteSupplierStep.glade.h:1
msgid "Include all products in quotes"
msgstr ""
@@ -5664,11 +5683,6 @@
msgid "History"
msgstr ""
-#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:5
-#: ../data/glade/PaymentMethodEditor.glade.h:7
-msgid "Interest:"
-msgstr ""
-
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:6
#: ../data/glade/InstallmentConfirmation.glade.h:7
msgid "Paid date:"
@@ -5678,10 +5692,6 @@
msgid "Paid value:"
msgstr ""
-#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:8
-msgid "Penalty:"
-msgstr ""
-
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:10
#: ../data/glade/DeviceConstantEditor.glade.h:5
#: ../data/glade/SellableTaxConstantEditor.glade.h:2
@@ -5824,7 +5834,7 @@
msgstr ""
#: ../data/glade/NoteSlave.glade.h:1
-#: ../data/glade/PurchaseDetailsDialog.glade.h:10
+#: ../data/glade/PurchaseDetailsDialog.glade.h:9
msgid "Notes:"
msgstr ""
@@ -6079,33 +6089,38 @@
msgid "Phone Number:"
msgstr ""
-#: ../data/glade/PurchaseDetailsDialog.glade.h:3
+#: ../data/glade/PurchaseDetailsDialog.glade.h:1
msgid "Additional Info"
msgstr ""
-#: ../data/glade/PurchaseDetailsDialog.glade.h:7
+#: ../data/glade/PurchaseDetailsDialog.glade.h:5
+#: ../data/glade/StartPurchaseStep.glade.h:5
+msgid "Expected Freight:"
+msgstr ""
+
+#: ../data/glade/PurchaseDetailsDialog.glade.h:6
#: ../data/glade/FinishPurchaseStep.glade.h:2
msgid "Expected Receival Date:"
msgstr ""
-#: ../data/glade/PurchaseDetailsDialog.glade.h:8
-#: ../data/glade/StartPurchaseStep.glade.h:8
+#: ../data/glade/PurchaseDetailsDialog.glade.h:7
+#: ../data/glade/StartPurchaseStep.glade.h:7
msgid "Freight Type:"
msgstr ""
-#: ../data/glade/PurchaseDetailsDialog.glade.h:11
+#: ../data/glade/PurchaseDetailsDialog.glade.h:10
#: ../data/glade/CreditProviderMethodSlave.glade.h:3
msgid "Number of Installments:"
msgstr ""
-#: ../data/glade/PurchaseDetailsDialog.glade.h:13
+#: ../data/glade/PurchaseDetailsDialog.glade.h:12
#: ../data/glade/PaymentChangeDialog.glade.h:2
-#: ../data/glade/StartPurchaseStep.glade.h:11
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:10
+#: ../data/glade/StartPurchaseStep.glade.h:9
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:13
msgid "Order Number:"
msgstr ""
-#: ../data/glade/PurchaseDetailsDialog.glade.h:14
+#: ../data/glade/PurchaseDetailsDialog.glade.h:13
msgid "Order Status:"
msgstr ""
@@ -6152,7 +6167,11 @@
msgid "Price ($CURRENCY):"
msgstr ""
-#: ../data/glade/StartPurchaseStep.glade.h:4
+#: ../data/glade/StartPurchaseStep.glade.h:1
+msgid "$CURRENCY"
+msgstr ""
+
+#: ../data/glade/StartPurchaseStep.glade.h:2
msgid "A_dd/Edit Supplier..."
msgstr ""
@@ -6175,11 +6194,6 @@
"the remaining value.</b>"
msgstr ""
-#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:3
-#: ../data/glade/SaleReturnSlave.glade.h:11
-msgid "Total Paid:"
-msgstr ""
-
#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:5
msgid "kiwilabel1"
msgstr ""
@@ -6370,7 +6384,7 @@
msgstr ""
#: ../data/glade/InstallmentConfirmation.glade.h:3
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:3
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:4
msgid "Discount ($CURRENCY):"
msgstr ""
@@ -6488,7 +6502,7 @@
msgstr ""
#: ../data/glade/ProductsAdjustment.glade.h:4
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:7
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:10
#: ../data/glade/FiscalBookEntryEditor.glade.h:3
msgid "Invoice Number:"
msgstr ""
@@ -6573,31 +6587,39 @@
msgid "Financial Status:"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:4
-msgid "Freight ($CURRENCY):"
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:3
+msgid "Create a separate payment for freight"
msgstr ""
#: ../data/glade/ReceivingInvoiceSlave.glade.h:5
+msgid "Freight ($CURRENCY):"
+msgstr ""
+
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:7
msgid "ICMS Total ($CURRENCY):"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:6
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:8
msgid "IPI ($CURRENCY):"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:8
-msgid "Invoice Total ($CURRENCY):"
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:9
+msgid "Include freight value in installments"
msgstr ""
#: ../data/glade/ReceivingInvoiceSlave.glade.h:11
+msgid "Invoice Total ($CURRENCY):"
+msgstr ""
+
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:14
msgid "Others Expenditures ($CURRENCY):"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:12
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:15
msgid "Products Total ($CURRENCY):"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:13
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:16
msgid "Secure ($CURRENCY):"
msgstr ""
Modified: stoqlib/trunk/po/sv.po
==============================================================================
--- stoqlib/trunk/po/sv.po Mon Jul 6 15:54:12 2009 (r8146)
+++ stoqlib/trunk/po/sv.po Mon Jul 6 15:54:49 2009 (r8147)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: stoqlib 0.2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 10:45-0300\n"
+"POT-Creation-Date: 2009-07-06 15:52-0300\n"
"PO-Revision-Date: 2007-07-18 11:35-0300\n"
"Last-Translator: Johan Dahlin <jdahlin at async.com.br>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -15,216 +15,35 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../stoqlib/reporting/payment.py:37
+#: ../stoqlib/reporting/payment.py:35
#, fuzzy
msgid "Payment Report"
msgstr "Betalningsmetod"
-#: ../stoqlib/reporting/payment.py:52 ../stoqlib/reporting/service.py:72
-#: ../stoqlib/reporting/template.py:321 ../stoqlib/reporting/sale.py:111
-#: ../stoqlib/reporting/sale.py:255
-#: ../stoqlib/reporting/purchase_receival.py:63
-#: ../stoqlib/reporting/till.py:64 ../stoqlib/gui/editors/producteditor.py:138
-#: ../stoqlib/gui/search/salesearch.py:91
-#: ../stoqlib/gui/dialogs/tillhistory.py:80
-#: ../stoqlib/gui/dialogs/receivingdialog.py:71
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:92
-#: ../stoqlib/gui/dialogs/saledetails.py:105
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:70
-#: ../stoqlib/gui/dialogs/clientdetails.py:112
-#: ../stoqlib/gui/dialogs/supplierdetails.py:108
-#: ../stoqlib/gui/dialogs/purchasedetails.py:109
-#: ../stoqlib/gui/dialogs/productstockdetails.py:91
-#: ../data/glade/SalesPersonStep.glade.h:9
-#: ../data/glade/SaleDetailsDialog.glade.h:14
-#: ../data/glade/PurchaseItemEditor.glade.h:8
-#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:6
-#: ../data/glade/MultipleMethodSlave.glade.h:5
-#: ../data/glade/RenegotiationDetailsDialog.glade.h:14
-#: ../data/glade/PurchaseDetailsDialog.glade.h:23
-#: ../data/glade/ReceivingItemEditor.glade.h:8
-#: ../data/glade/PurchasePaymentStep.glade.h:4
-#: ../data/glade/SaleQuoteItemEditor.glade.h:6
-msgid "Total:"
-msgstr "Totalt:"
-
-#: ../stoqlib/reporting/payment.py:65 ../stoqlib/reporting/sale.py:170
-#: ../stoqlib/gui/search/salesearch.py:68
-#: ../stoqlib/gui/search/paymentsearch.py:76
-#: ../stoqlib/gui/wizards/receivingwizard.py:96
-#: ../stoqlib/gui/dialogs/tillhistory.py:61
-msgid "Number"
-msgstr "Nummer"
-
-#: ../stoqlib/reporting/payment.py:67 ../stoqlib/reporting/payment.py:94
-#: ../stoqlib/reporting/service.py:56 ../stoqlib/reporting/template.py:311
-#: ../stoqlib/reporting/product.py:166 ../stoqlib/reporting/purchase.py:166
-#: ../stoqlib/reporting/till.py:52 ../stoqlib/gui/editors/tilleditor.py:212
-#: ../stoqlib/gui/editors/invoiceeditor.py:228
-#: ../stoqlib/gui/editors/invoiceeditor.py:286
-#: ../stoqlib/gui/editors/sellableeditor.py:102
-#: ../stoqlib/gui/editors/producteditor.py:124
-#: ../stoqlib/gui/search/servicesearch.py:110
-#: ../stoqlib/gui/search/fiscalsearch.py:72
-#: ../stoqlib/gui/search/categorysearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:154
-#: ../stoqlib/gui/search/productsearch.py:229
-#: ../stoqlib/gui/search/productsearch.py:275
-#: ../stoqlib/gui/search/purchasesearch.py:78
-#: ../stoqlib/gui/search/sellablesearch.py:122
-#: ../stoqlib/gui/search/tillsearch.py:118
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:80
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:125
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:88
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:114
-#: ../stoqlib/gui/wizards/salequotewizard.py:169
-#: ../stoqlib/gui/wizards/purchasewizard.py:235
-#: ../stoqlib/gui/wizards/receivingwizard.py:243
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:131
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:465
-#: ../stoqlib/gui/dialogs/quotedialog.py:91
-#: ../stoqlib/gui/dialogs/initialstockdialog.py:83
-#: ../stoqlib/gui/dialogs/openinventorydialog.py:141
-#: ../stoqlib/gui/dialogs/tillhistory.py:65
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:103
-#: ../stoqlib/gui/dialogs/receivingdialog.py:83
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:124
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:142
-#: ../stoqlib/gui/dialogs/productcountingdialog.py:75
-#: ../stoqlib/gui/dialogs/devices.py:50
-#: ../stoqlib/gui/dialogs/saledetails.py:152
-#: ../stoqlib/gui/dialogs/saledetails.py:173
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:81
-#: ../stoqlib/gui/dialogs/clientdetails.py:137
-#: ../stoqlib/gui/dialogs/clientdetails.py:148
-#: ../stoqlib/gui/dialogs/clientdetails.py:159
-#: ../stoqlib/gui/dialogs/supplierdetails.py:131
-#: ../stoqlib/gui/dialogs/supplierdetails.py:144
-#: ../stoqlib/gui/dialogs/purchasedetails.py:157
-#: ../stoqlib/gui/dialogs/purchasedetails.py:170
-#: ../stoqlib/gui/dialogs/purchasedetails.py:186
-#: ../stoqlib/gui/slaves/installmentslave.py:228
-#: ../stoqlib/gui/slaves/paymentslave.py:1035
-msgid "Description"
-msgstr "Beskrivning"
-
-#: ../stoqlib/reporting/payment.py:69
-#: ../stoqlib/gui/search/fiscalsearch.py:128
-msgid "Drawee"
-msgstr ""
-
-#: ../stoqlib/reporting/payment.py:72 ../stoqlib/reporting/payment.py:99
-#: ../stoqlib/reporting/payment.py:133 ../stoqlib/reporting/purchase.py:168
-#, fuzzy
-msgid "Due date"
-msgstr "Datum:"
-
-#: ../stoqlib/reporting/payment.py:74 ../stoqlib/reporting/payment.py:101
-#: ../stoqlib/reporting/payment.py:135
-#: ../stoqlib/gui/slaves/installmentslave.py:230
-#, fuzzy
-msgid "Paid date"
-msgstr "Betalad"
-
-#: ../stoqlib/reporting/payment.py:76 ../stoqlib/reporting/payment.py:103
-#: ../stoqlib/reporting/payment.py:137 ../stoqlib/reporting/sale.py:182
-#: ../stoqlib/gui/search/personsearch.py:116
-#: ../stoqlib/gui/search/personsearch.py:336
-#: ../stoqlib/gui/search/paymentsearch.py:82
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:133
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:92
-#: ../stoqlib/gui/dialogs/renegotiationdetails.py:131
-#: ../stoqlib/gui/dialogs/saledetails.py:159
-#: ../stoqlib/gui/dialogs/clientdetails.py:129
-#: ../stoqlib/gui/dialogs/clientdetails.py:164
-#: ../stoqlib/gui/dialogs/supplierdetails.py:123
-#: ../stoqlib/gui/dialogs/supplierdetails.py:149
-#: ../stoqlib/gui/dialogs/purchasedetails.py:194
-#: ../stoqlib/domain/payment/views.py:262
-msgid "Status"
-msgstr "Status"
-
-#: ../stoqlib/reporting/payment.py:78 ../stoqlib/reporting/payment.py:105
-#: ../stoqlib/reporting/payment.py:139 ../stoqlib/reporting/purchase.py:170
-#: ../stoqlib/reporting/sale.py:235 ../stoqlib/reporting/till.py:56
+#: ../stoqlib/reporting/payment.py:48 ../stoqlib/reporting/purchase.py:169
+#: ../stoqlib/reporting/sale.py:191 ../stoqlib/reporting/till.py:49
#: ../stoqlib/gui/search/tillsearch.py:124
#: ../stoqlib/gui/search/paymentsearch.py:85
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:134
#: ../stoqlib/gui/wizards/renegotiationwizard.py:93
#: ../stoqlib/gui/dialogs/tillhistory.py:68
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:132
-#: ../stoqlib/gui/dialogs/saledetails.py:160
+#: ../stoqlib/gui/dialogs/saledetails.py:153
#: ../stoqlib/gui/dialogs/clientdetails.py:166
#: ../stoqlib/gui/dialogs/supplierdetails.py:151
-#: ../stoqlib/gui/dialogs/purchasedetails.py:195
-#: ../stoqlib/gui/slaves/installmentslave.py:231
+#: ../stoqlib/gui/dialogs/purchasedetails.py:178
+#: ../stoqlib/gui/slaves/installmentslave.py:247
#: ../stoqlib/gui/slaves/paymentslave.py:1037
#: ../plugins/ecf/deviceconstanteditor.py:136
msgid "Value"
msgstr "Värde"
-#: ../stoqlib/reporting/payment.py:92 ../stoqlib/reporting/payment.py:119
-#: ../stoqlib/reporting/purchase.py:162
-#: ../stoqlib/gui/search/fiscalsearch.py:121
-#: ../stoqlib/gui/search/transfersearch.py:89
-#: ../stoqlib/gui/search/tillsearch.py:113
-#: ../stoqlib/gui/search/paymentsearch.py:68
-#: ../stoqlib/gui/wizards/renegotiationwizard.py:87
-#: ../stoqlib/gui/dialogs/clientdetails.py:122
-#: ../stoqlib/gui/dialogs/clientdetails.py:154
-#: ../stoqlib/gui/dialogs/supplierdetails.py:118
-#: ../stoqlib/gui/dialogs/supplierdetails.py:139
-#: ../stoqlib/gui/dialogs/productstockdetails.py:127
-#: ../stoqlib/gui/dialogs/productstockdetails.py:142
-#: ../stoqlib/gui/dialogs/productstockdetails.py:156
-#: ../stoqlib/gui/dialogs/productstockdetails.py:172
-msgid "#"
-msgstr "#"
-
-#: ../stoqlib/reporting/payment.py:96
-#: ../stoqlib/reporting/purchase_receival.py:50
-#: ../stoqlib/gui/editors/personeditor.py:249
-#: ../stoqlib/gui/editors/producteditor.py:370
-#: ../stoqlib/gui/editors/producteditor.py:390
-#: ../stoqlib/gui/search/receivingsearch.py:81
-#: ../stoqlib/gui/wizards/receivingwizard.py:102
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:183
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:352
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:467
-#: ../stoqlib/gui/dialogs/productstockdetails.py:133
-msgid "Supplier"
-msgstr "Leverantör"
-
-#: ../stoqlib/reporting/payment.py:121
-#: ../stoqlib/gui/search/paymentsearch.py:70
-#, fuzzy
-msgid "Bank"
-msgstr "Bank:"
-
-#: ../stoqlib/reporting/payment.py:124
-#: ../stoqlib/reporting/purchase_receival.py:52
-#: ../stoqlib/gui/editors/personeditor.py:297
-#: ../stoqlib/gui/search/stationsearch.py:63 ../stoqlib/gui/base/search.py:303
-msgid "Branch"
-msgstr "Avdelning"
-
-#: ../stoqlib/reporting/payment.py:127
-#: ../stoqlib/gui/search/paymentsearch.py:74
-#, fuzzy
-msgid "Account"
-msgstr "Konto:"
-
-#: ../stoqlib/reporting/payment.py:130
-#, fuzzy
-msgid "Payment number"
-msgstr "Betalningstyp"
-
#: ../stoqlib/reporting/receival_receipt.py:39
#, fuzzy
msgid "Receival receipt"
msgstr "Välj föremål"
-#: ../stoqlib/reporting/service.py:41 ../stoqlib/reporting/service.py:81
+#: ../stoqlib/reporting/service.py:41 ../stoqlib/reporting/service.py:63
#, fuzzy
msgid "Service Listing"
msgstr "Tjänster"
@@ -236,79 +55,27 @@
msgstr ""
#: ../stoqlib/reporting/service.py:43
-#: ../stoqlib/gui/search/servicesearch.py:55
+#: ../stoqlib/gui/search/servicesearch.py:56
msgid "services"
msgstr "tjänster"
-#. XXX Bug #2430 will improve this part
-#: ../stoqlib/reporting/service.py:55 ../stoqlib/reporting/template.py:310
-#: ../stoqlib/reporting/product.py:165 ../stoqlib/reporting/sale.py:81
-#: ../stoqlib/reporting/sale.py:226 ../stoqlib/reporting/till.py:50
-#: ../stoqlib/gui/editors/producteditor.py:119
-#: ../stoqlib/gui/search/servicesearch.py:106
-#: ../stoqlib/gui/search/productsearch.py:148
-#: ../stoqlib/gui/search/productsearch.py:227
-#: ../stoqlib/gui/search/productsearch.py:271
-#: ../stoqlib/gui/search/sellablesearch.py:118
-#: ../stoqlib/gui/wizards/purchasewizard.py:234
-#: ../stoqlib/gui/dialogs/initialstockdialog.py:81
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:101
-#: ../stoqlib/gui/dialogs/receivingdialog.py:81
-#: ../stoqlib/gui/dialogs/productcountingdialog.py:73
-#: ../stoqlib/gui/dialogs/saledetails.py:170
-#: ../stoqlib/gui/dialogs/transferorderdialog.py:79
-#: ../stoqlib/gui/dialogs/clientdetails.py:135
-#: ../stoqlib/gui/dialogs/clientdetails.py:145
-#: ../stoqlib/gui/dialogs/supplierdetails.py:129
-msgid "Code"
-msgstr "Kod"
-
-#: ../stoqlib/reporting/service.py:57 ../stoqlib/reporting/product.py:66
-#: ../stoqlib/reporting/purchase.py:102 ../stoqlib/reporting/purchase.py:233
+#: ../stoqlib/reporting/service.py:55 ../stoqlib/reporting/product.py:66
+#: ../stoqlib/reporting/purchase.py:102 ../stoqlib/reporting/purchase.py:232
#: ../stoqlib/gui/editors/producteditor.py:395
-#: ../stoqlib/gui/search/servicesearch.py:114
-#: ../stoqlib/gui/search/productsearch.py:163
+#: ../stoqlib/gui/search/servicesearch.py:115
+#: ../stoqlib/gui/search/productsearch.py:165
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:88
-#: ../stoqlib/gui/wizards/purchasewizard.py:245
-#: ../stoqlib/gui/wizards/receivingwizard.py:251
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:472
+#: ../stoqlib/gui/wizards/purchasewizard.py:251
+#: ../stoqlib/gui/wizards/receivingwizard.py:253
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:475
#: ../stoqlib/gui/dialogs/quotedialog.py:95
#: ../stoqlib/gui/dialogs/receivingdialog.py:88
#: ../stoqlib/gui/dialogs/transferorderdialog.py:85
-#: ../stoqlib/gui/dialogs/purchasedetails.py:163
-#: ../stoqlib/gui/dialogs/purchasedetails.py:177
+#: ../stoqlib/gui/dialogs/purchasedetails.py:146
+#: ../stoqlib/gui/dialogs/purchasedetails.py:160
msgid "Cost"
msgstr "Kostnad"
-#: ../stoqlib/reporting/service.py:58 ../stoqlib/reporting/template.py:313
-#: ../stoqlib/reporting/product.py:67 ../stoqlib/reporting/sale.py:88
-#: ../stoqlib/gui/search/servicesearch.py:118
-#: ../stoqlib/gui/search/productsearch.py:166
-#: ../stoqlib/gui/search/sellablesearch.py:124
-#: ../stoqlib/gui/wizards/salequotewizard.py:177
-#: ../stoqlib/gui/dialogs/saledetails.py:177
-msgid "Price"
-msgstr "Pris"
-
-#: ../stoqlib/reporting/service.py:59
-msgid "C.M."
-msgstr ""
-
-#. FIXME: This column should be virtual, waiting for bug #2764
-#: ../stoqlib/reporting/service.py:62 ../stoqlib/reporting/product.py:172
-#: ../stoqlib/gui/editors/producteditor.py:123
-#: ../stoqlib/gui/wizards/purchasefinishwizard.py:86
-#: ../stoqlib/gui/wizards/salequotewizard.py:175
-#: ../stoqlib/gui/wizards/purchasewizard.py:243
-#: ../stoqlib/gui/wizards/receivingwizard.py:249
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:135
-#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:105
-#: ../stoqlib/gui/dialogs/productstockdetails.py:139
-#: ../stoqlib/gui/dialogs/productstockdetails.py:153
-#: ../plugins/ecf/ecfdomain.py:248
-msgid "Unit"
-msgstr "Enhet"
-
#: ../stoqlib/reporting/template.py:122
#, python-format
msgid "Phone: %s"
@@ -348,6 +115,112 @@
msgid "Totals:"
msgstr "Noteringar:"
+#. XXX Bug #2430 will improve this part
+#: ../stoqlib/reporting/template.py:310 ../stoqlib/reporting/product.py:165
+#: ../stoqlib/reporting/sale.py:80 ../stoqlib/reporting/sale.py:182
+#: ../stoqlib/gui/editors/producteditor.py:119
+#: ../stoqlib/gui/search/servicesearch.py:107
+#: ../stoqlib/gui/search/productsearch.py:149
+#: ../stoqlib/gui/search/productsearch.py:229
+#: ../stoqlib/gui/search/productsearch.py:273
+#: ../stoqlib/gui/search/sellablesearch.py:119
+#: ../stoqlib/gui/wizards/purchasewizard.py:240
+#: ../stoqlib/gui/dialogs/initialstockdialog.py:81
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:101
+#: ../stoqlib/gui/dialogs/receivingdialog.py:81
+#: ../stoqlib/gui/dialogs/productcountingdialog.py:73
+#: ../stoqlib/gui/dialogs/saledetails.py:163
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:79
+#: ../stoqlib/gui/dialogs/clientdetails.py:135
+#: ../stoqlib/gui/dialogs/clientdetails.py:145
+#: ../stoqlib/gui/dialogs/supplierdetails.py:129
+msgid "Code"
+msgstr "Kod"
+
+#: ../stoqlib/reporting/template.py:311 ../stoqlib/reporting/product.py:166
+#: ../stoqlib/reporting/purchase.py:165
+#: ../stoqlib/gui/editors/tilleditor.py:212
+#: ../stoqlib/gui/editors/invoiceeditor.py:228
+#: ../stoqlib/gui/editors/invoiceeditor.py:286
+#: ../stoqlib/gui/editors/sellableeditor.py:102
+#: ../stoqlib/gui/editors/producteditor.py:124
+#: ../stoqlib/gui/search/servicesearch.py:111
+#: ../stoqlib/gui/search/fiscalsearch.py:72
+#: ../stoqlib/gui/search/categorysearch.py:63
+#: ../stoqlib/gui/search/productsearch.py:156
+#: ../stoqlib/gui/search/productsearch.py:231
+#: ../stoqlib/gui/search/productsearch.py:277
+#: ../stoqlib/gui/search/purchasesearch.py:78
+#: ../stoqlib/gui/search/sellablesearch.py:124
+#: ../stoqlib/gui/search/tillsearch.py:118
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:80
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:125
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:88
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:114
+#: ../stoqlib/gui/wizards/salequotewizard.py:169
+#: ../stoqlib/gui/wizards/purchasewizard.py:241
+#: ../stoqlib/gui/wizards/receivingwizard.py:245
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:132
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:468
+#: ../stoqlib/gui/dialogs/quotedialog.py:91
+#: ../stoqlib/gui/dialogs/initialstockdialog.py:83
+#: ../stoqlib/gui/dialogs/openinventorydialog.py:141
+#: ../stoqlib/gui/dialogs/tillhistory.py:65
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:103
+#: ../stoqlib/gui/dialogs/receivingdialog.py:83
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:124
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:142
+#: ../stoqlib/gui/dialogs/productcountingdialog.py:75
+#: ../stoqlib/gui/dialogs/devices.py:50
+#: ../stoqlib/gui/dialogs/saledetails.py:145
+#: ../stoqlib/gui/dialogs/saledetails.py:166
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:81
+#: ../stoqlib/gui/dialogs/clientdetails.py:137
+#: ../stoqlib/gui/dialogs/clientdetails.py:148
+#: ../stoqlib/gui/dialogs/clientdetails.py:159
+#: ../stoqlib/gui/dialogs/supplierdetails.py:131
+#: ../stoqlib/gui/dialogs/supplierdetails.py:144
+#: ../stoqlib/gui/dialogs/purchasedetails.py:140
+#: ../stoqlib/gui/dialogs/purchasedetails.py:153
+#: ../stoqlib/gui/dialogs/purchasedetails.py:169
+#: ../stoqlib/gui/slaves/installmentslave.py:244
+#: ../stoqlib/gui/slaves/paymentslave.py:1035
+msgid "Description"
+msgstr "Beskrivning"
+
+#: ../stoqlib/reporting/template.py:313 ../stoqlib/reporting/product.py:67
+#: ../stoqlib/reporting/sale.py:87 ../stoqlib/gui/search/servicesearch.py:119
+#: ../stoqlib/gui/search/productsearch.py:168
+#: ../stoqlib/gui/search/sellablesearch.py:126
+#: ../stoqlib/gui/wizards/salequotewizard.py:177
+#: ../stoqlib/gui/dialogs/saledetails.py:170
+msgid "Price"
+msgstr "Pris"
+
+#: ../stoqlib/reporting/template.py:321 ../stoqlib/reporting/sale.py:110
+#: ../stoqlib/reporting/sale.py:211
+#: ../stoqlib/gui/editors/producteditor.py:138
+#: ../stoqlib/gui/search/salesearch.py:91
+#: ../stoqlib/gui/dialogs/tillhistory.py:80
+#: ../stoqlib/gui/dialogs/receivingdialog.py:71
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:92
+#: ../stoqlib/gui/dialogs/transferorderdialog.py:70
+#: ../stoqlib/gui/dialogs/clientdetails.py:112
+#: ../stoqlib/gui/dialogs/supplierdetails.py:108
+#: ../stoqlib/gui/dialogs/productstockdetails.py:91
+#: ../data/glade/SalesPersonStep.glade.h:9
+#: ../data/glade/SaleDetailsDialog.glade.h:17
+#: ../data/glade/PurchaseItemEditor.glade.h:8
+#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:6
+#: ../data/glade/MultipleMethodSlave.glade.h:5
+#: ../data/glade/RenegotiationDetailsDialog.glade.h:14
+#: ../data/glade/PurchaseDetailsDialog.glade.h:24
+#: ../data/glade/ReceivingItemEditor.glade.h:8
+#: ../data/glade/PurchasePaymentStep.glade.h:4
+#: ../data/glade/SaleQuoteItemEditor.glade.h:6
+msgid "Total:"
+msgstr "Totalt:"
+
#: ../stoqlib/reporting/template.py:333
msgid "Untitled"
msgstr "Namnlös"
@@ -370,42 +243,43 @@
msgstr ""
#: ../stoqlib/reporting/product.py:68
-#: ../stoqlib/gui/search/productsearch.py:169
+#: ../stoqlib/gui/search/productsearch.py:171
msgid "Stock Total"
msgstr "Totalt lager"
#: ../stoqlib/reporting/product.py:92 ../stoqlib/reporting/product.py:170
-#: ../stoqlib/reporting/purchase.py:104 ../stoqlib/reporting/purchase.py:234
-#: ../stoqlib/reporting/sale.py:86 ../stoqlib/gui/editors/producteditor.py:121
+#: ../stoqlib/reporting/purchase.py:104 ../stoqlib/reporting/purchase.py:233
+#: ../stoqlib/reporting/sale.py:85 ../stoqlib/gui/editors/producteditor.py:121
+#: ../stoqlib/gui/search/salesearch.py:136
#: ../stoqlib/gui/wizards/salequotewizard.py:173
-#: ../stoqlib/gui/wizards/purchasewizard.py:239
-#: ../stoqlib/gui/wizards/receivingwizard.py:245
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:133
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:469
+#: ../stoqlib/gui/wizards/purchasewizard.py:245
+#: ../stoqlib/gui/wizards/receivingwizard.py:247
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:134
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:472
#: ../stoqlib/gui/dialogs/quotedialog.py:93
#: ../stoqlib/gui/dialogs/receivingdialog.py:85
-#: ../stoqlib/gui/dialogs/saledetails.py:175
+#: ../stoqlib/gui/dialogs/saledetails.py:168
#: ../stoqlib/gui/dialogs/transferorderdialog.py:83
-#: ../stoqlib/gui/dialogs/purchasedetails.py:160
+#: ../stoqlib/gui/dialogs/purchasedetails.py:143
#: ../stoqlib/gui/dialogs/productstockdetails.py:137
msgid "Quantity"
msgstr "Antal"
#: ../stoqlib/reporting/product.py:119 ../stoqlib/reporting/product.py:189
-#: ../stoqlib/gui/search/productsearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:249
+#: ../stoqlib/gui/search/productsearch.py:64
+#: ../stoqlib/gui/search/productsearch.py:251
msgid "products"
msgstr "varor"
#: ../stoqlib/reporting/product.py:136
-#: ../stoqlib/gui/search/productsearch.py:231
+#: ../stoqlib/gui/search/productsearch.py:233
#: ../stoqlib/gui/dialogs/productstockdetails.py:150
-#: ../stoqlib/domain/sellable.py:250
+#: ../stoqlib/domain/sellable.py:248
msgid "Sold"
msgstr "Såld"
#: ../stoqlib/reporting/product.py:137 ../stoqlib/reporting/purchase.py:68
-#: ../stoqlib/gui/search/productsearch.py:238
+#: ../stoqlib/gui/search/productsearch.py:240
#: ../stoqlib/gui/search/purchasesearch.py:82
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:84
#: ../data/glade/PurchaseDetailsDialog.glade.h:18
@@ -413,14 +287,14 @@
msgstr "Mottagen"
#: ../stoqlib/reporting/product.py:138
-#: ../stoqlib/gui/search/productsearch.py:234
+#: ../stoqlib/gui/search/productsearch.py:236
#: ../stoqlib/gui/dialogs/productstockdetails.py:168
#, fuzzy
msgid "Transfered"
msgstr "Radera"
#: ../stoqlib/reporting/product.py:140
-#: ../stoqlib/gui/search/productsearch.py:236
+#: ../stoqlib/gui/search/productsearch.py:238
#, fuzzy
msgid "Retained"
msgstr "Återlämnad"
@@ -441,31 +315,46 @@
msgid "Fiscal Class"
msgstr ""
+#. FIXME: This column should be virtual, waiting for bug #2764
+#: ../stoqlib/reporting/product.py:172
+#: ../stoqlib/gui/editors/producteditor.py:123
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:86
+#: ../stoqlib/gui/wizards/salequotewizard.py:175
+#: ../stoqlib/gui/wizards/purchasewizard.py:249
+#: ../stoqlib/gui/wizards/receivingwizard.py:251
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:136
+#: ../stoqlib/gui/dialogs/productadjustmentdialog.py:105
+#: ../stoqlib/gui/dialogs/productstockdetails.py:139
+#: ../stoqlib/gui/dialogs/productstockdetails.py:153
+#: ../plugins/ecf/ecfdomain.py:248
+msgid "Unit"
+msgstr "Enhet"
+
#: ../stoqlib/reporting/product.py:188
#, fuzzy
msgid "Product Stock Report"
msgstr "Varor att leverera:"
#: ../stoqlib/reporting/product.py:208
-#: ../stoqlib/gui/search/productsearch.py:279
+#: ../stoqlib/gui/search/productsearch.py:281
msgid "Maximum"
msgstr ""
#: ../stoqlib/reporting/product.py:209
-#: ../stoqlib/gui/search/productsearch.py:282
+#: ../stoqlib/gui/search/productsearch.py:284
#, fuzzy
msgid "Minimum"
msgstr "köp"
#: ../stoqlib/reporting/product.py:210
-#: ../stoqlib/gui/search/productsearch.py:284
+#: ../stoqlib/gui/search/productsearch.py:286
#: ../stoqlib/gui/search/purchasesearch.py:84
#, fuzzy
msgid "In Stock"
msgstr "Lager"
#: ../stoqlib/reporting/product.py:212
-#: ../stoqlib/gui/search/productsearch.py:286
+#: ../stoqlib/gui/search/productsearch.py:288
#, fuzzy
msgid "To Receive"
msgstr "Mottagen"
@@ -478,51 +367,50 @@
msgid "orders"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:48 ../stoqlib/reporting/sale.py:154
+#: ../stoqlib/reporting/purchase.py:48 ../stoqlib/reporting/sale.py:137
#, python-format
msgid "with status <u>%s</u>"
msgstr ""
#: ../stoqlib/reporting/purchase.py:66
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:82
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:470
-#: ../stoqlib/domain/sale.py:278
-#: ../data/glade/PurchaseDetailsDialog.glade.h:15
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:473
+#: ../stoqlib/domain/sale.py:280
+#: ../data/glade/PurchaseDetailsDialog.glade.h:14
msgid "Ordered"
msgstr "Beställd"
#: ../stoqlib/reporting/purchase.py:70 ../stoqlib/reporting/purchase.py:106
-#: ../stoqlib/reporting/purchase.py:111 ../stoqlib/reporting/purchase.py:236
-#: ../stoqlib/reporting/sale.py:179 ../stoqlib/gui/search/salesearch.py:80
+#: ../stoqlib/reporting/purchase.py:111 ../stoqlib/reporting/purchase.py:235
+#: ../stoqlib/reporting/sale.py:149 ../stoqlib/gui/search/salesearch.py:80
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:89
#: ../stoqlib/gui/wizards/stocktransferwizard.py:120
#: ../stoqlib/gui/wizards/salequotewizard.py:179
-#: ../stoqlib/gui/wizards/purchasewizard.py:247
-#: ../stoqlib/gui/wizards/receivingwizard.py:253
+#: ../stoqlib/gui/wizards/purchasewizard.py:253
+#: ../stoqlib/gui/wizards/receivingwizard.py:255
#: ../stoqlib/gui/dialogs/receivingdialog.py:91
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:146
-#: ../stoqlib/gui/dialogs/saledetails.py:178
+#: ../stoqlib/gui/dialogs/saledetails.py:171
#: ../stoqlib/gui/dialogs/clientdetails.py:131
#: ../stoqlib/gui/dialogs/supplierdetails.py:125
-#: ../stoqlib/gui/dialogs/purchasedetails.py:129
-#: ../stoqlib/gui/dialogs/purchasedetails.py:165
-#: ../stoqlib/gui/dialogs/purchasedetails.py:180
+#: ../stoqlib/gui/dialogs/purchasedetails.py:112
+#: ../stoqlib/gui/dialogs/purchasedetails.py:148
+#: ../stoqlib/gui/dialogs/purchasedetails.py:163
msgid "Total"
msgstr "Totalt"
#: ../stoqlib/reporting/purchase.py:81
-#: ../stoqlib/reporting/purchase_receival.py:48
#: ../stoqlib/gui/dialogs/productstockdetails.py:131
msgid "Purchase Order"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:95 ../stoqlib/reporting/purchase.py:228
-#: ../stoqlib/reporting/sale.py:83
+#: ../stoqlib/reporting/purchase.py:95 ../stoqlib/reporting/purchase.py:227
+#: ../stoqlib/reporting/sale.py:82 ../stoqlib/gui/search/salesearch.py:127
msgid "Item"
msgstr "Föremål"
#: ../stoqlib/reporting/purchase.py:109
-#: ../stoqlib/gui/wizards/receivingwizard.py:108
+#: ../stoqlib/gui/wizards/receivingwizard.py:109
#, fuzzy
msgid "Qty Received"
msgstr "Välj föremål"
@@ -532,52 +420,73 @@
msgid "Purchase Ordered Items"
msgstr "Välj föremål"
-#: ../stoqlib/reporting/purchase.py:138 ../stoqlib/reporting/purchase.py:193
-#: ../stoqlib/domain/sale.py:559
+#: ../stoqlib/reporting/purchase.py:138 ../stoqlib/reporting/purchase.py:192
+#: ../stoqlib/domain/sale.py:578
msgid "Not Specified"
msgstr "Ej Specifierad"
-#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:239
-#: ../data/glade/PurchaseDetailsDialog.glade.h:24
+#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:238
+#: ../data/glade/PurchaseDetailsDialog.glade.h:25
#: ../data/glade/FinishPurchaseStep.glade.h:6
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:15
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:18
msgid "Transporter:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:240
-#: ../data/glade/PurchaseDetailsDialog.glade.h:9
-#: ../data/glade/StartPurchaseStep.glade.h:9
+#: ../stoqlib/reporting/purchase.py:139 ../stoqlib/reporting/purchase.py:239
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:6
#: ../data/glade/TransporterDataSlave.glade.h:4
msgid "Freight:"
msgstr "Frakt:"
-#: ../stoqlib/reporting/purchase.py:154
+#: ../stoqlib/reporting/purchase.py:153
#, fuzzy, python-format
msgid "Payments: %d installments"
msgstr "Noteringar:"
-#: ../stoqlib/reporting/purchase.py:157
+#: ../stoqlib/reporting/purchase.py:156
#, fuzzy
msgid "Payments: 1 installment"
msgstr "Noteringar:"
-#: ../stoqlib/reporting/purchase.py:164
+#: ../stoqlib/reporting/purchase.py:161
+#: ../stoqlib/gui/search/fiscalsearch.py:121
+#: ../stoqlib/gui/search/transfersearch.py:89
+#: ../stoqlib/gui/search/tillsearch.py:113
+#: ../stoqlib/gui/search/paymentsearch.py:68
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:87
+#: ../stoqlib/gui/dialogs/clientdetails.py:122
+#: ../stoqlib/gui/dialogs/clientdetails.py:154
+#: ../stoqlib/gui/dialogs/supplierdetails.py:118
+#: ../stoqlib/gui/dialogs/supplierdetails.py:139
+#: ../stoqlib/gui/dialogs/productstockdetails.py:127
+#: ../stoqlib/gui/dialogs/productstockdetails.py:142
+#: ../stoqlib/gui/dialogs/productstockdetails.py:156
+#: ../stoqlib/gui/dialogs/productstockdetails.py:172
+msgid "#"
+msgstr "#"
+
+#: ../stoqlib/reporting/purchase.py:163
#, fuzzy
msgid "Method"
msgstr "Lesotho"
-#: ../stoqlib/reporting/purchase.py:181 ../stoqlib/reporting/purchase.py:247
+#: ../stoqlib/reporting/purchase.py:167
+#, fuzzy
+msgid "Due date"
+msgstr "Datum:"
+
+#: ../stoqlib/reporting/purchase.py:180 ../stoqlib/reporting/purchase.py:246
#: ../data/glade/TillClosing.glade.h:5
-#: ../data/glade/SaleDetailsDialog.glade.h:8
+#: ../data/glade/SaleDetailsDialog.glade.h:9
#: ../data/glade/OpenInventoryDialog.glade.h:3
#: ../data/glade/RenegotiationDetailsDialog.glade.h:8
-#: ../data/glade/PurchaseDetailsDialog.glade.h:12
-#: ../data/glade/StartPurchaseStep.glade.h:10
+#: ../data/glade/PurchaseDetailsDialog.glade.h:11
+#: ../data/glade/StartPurchaseStep.glade.h:8
msgid "Open Date:"
msgstr "Öppningsdatum:"
-#: ../stoqlib/reporting/purchase.py:182
-#: ../data/glade/SaleDetailsDialog.glade.h:11
+#: ../stoqlib/reporting/purchase.py:181
+#: ../data/glade/SaleDetailsDialog.glade.h:13
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:9
#: ../data/glade/RenegotiationDetailsDialog.glade.h:11
#: ../data/glade/PaymentChangeDialog.glade.h:4
@@ -588,20 +497,20 @@
msgid "Status:"
msgstr "Status:"
-#: ../stoqlib/reporting/purchase.py:183 ../stoqlib/reporting/purchase.py:250
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:334
+#: ../stoqlib/reporting/purchase.py:182 ../stoqlib/reporting/purchase.py:249
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:336
#: ../stoqlib/gui/dialogs/paymentchangedialog.py:71
#: ../data/glade/PurchaseDetailsDialog.glade.h:21
-#: ../data/glade/StartPurchaseStep.glade.h:12
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:14
+#: ../data/glade/StartPurchaseStep.glade.h:10
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:17
#: ../data/glade/SupplierDetailsDialog.glade.h:7
msgid "Supplier:"
msgstr "Leverantör:"
-#: ../stoqlib/reporting/purchase.py:184 ../stoqlib/reporting/purchase.py:251
+#: ../stoqlib/reporting/purchase.py:183 ../stoqlib/reporting/purchase.py:250
#: ../data/glade/OpenInventoryDialog.glade.h:1
-#: ../data/glade/PurchaseDetailsDialog.glade.h:4
-#: ../data/glade/StartPurchaseStep.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:2
+#: ../data/glade/StartPurchaseStep.glade.h:3
#: ../data/glade/StationEditor.glade.h:2
#: ../data/glade/ProductsAdjustment.glade.h:1
#: ../data/glade/ReceivingInvoiceSlave.glade.h:1
@@ -609,76 +518,76 @@
msgid "Branch:"
msgstr "Avdelning:"
-#: ../stoqlib/reporting/purchase.py:194
+#: ../stoqlib/reporting/purchase.py:193
#, python-format
msgid "Expected Receival Date: %s"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:209
+#: ../stoqlib/reporting/purchase.py:208
#, python-format
msgid "Purchase Order #%s"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:215
+#: ../stoqlib/reporting/purchase.py:214
msgid "Quote Request"
msgstr ""
#. To be filled
-#: ../stoqlib/reporting/purchase.py:249 ../data/glade/StartQuoteStep.glade.h:2
+#: ../stoqlib/reporting/purchase.py:248 ../data/glade/StartQuoteStep.glade.h:2
msgid "Deadline:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:260
+#: ../stoqlib/reporting/purchase.py:259
#, fuzzy
msgid "Payment Settings"
msgstr "Betalningsmetod"
-#: ../stoqlib/reporting/purchase.py:264
-#: ../data/glade/PurchaseDetailsDialog.glade.h:16
+#: ../stoqlib/reporting/purchase.py:263
+#: ../data/glade/PurchaseDetailsDialog.glade.h:15
#: ../data/glade/PurchasePaymentStep.glade.h:2
msgid "Payment Method:"
msgstr "Betalningsmetod:"
-#: ../stoqlib/reporting/purchase.py:264
+#: ../stoqlib/reporting/purchase.py:263
#, fuzzy
msgid "Installments:"
msgstr "Noteringar:"
-#: ../stoqlib/reporting/purchase.py:265
+#: ../stoqlib/reporting/purchase.py:264
#, fuzzy
msgid "Intervals:"
msgstr "Ränta:"
-#: ../stoqlib/reporting/purchase.py:265
+#: ../stoqlib/reporting/purchase.py:264
msgid "Obs:"
msgstr ""
-#: ../stoqlib/reporting/purchase.py:272
+#: ../stoqlib/reporting/purchase.py:271
msgid "Quoting Items"
msgstr ""
#. The supplier name here ?
-#: ../stoqlib/reporting/purchase.py:279
+#: ../stoqlib/reporting/purchase.py:278
#: ../stoqlib/gui/dialogs/productstockdetails.py:166
#, fuzzy
msgid "Responsible"
msgstr "Ansvarig:"
-#: ../stoqlib/reporting/sale.py:48
+#: ../stoqlib/reporting/sale.py:47
msgid "Sale Order"
msgstr "Försäljningsorder"
-#: ../stoqlib/reporting/sale.py:64
+#: ../stoqlib/reporting/sale.py:63
#, fuzzy
msgid "No client"
msgstr "Sök"
-#: ../stoqlib/reporting/sale.py:69
+#: ../stoqlib/reporting/sale.py:68
#, fuzzy
msgid "No phone number"
msgstr "Telefonnummer"
-#: ../stoqlib/reporting/sale.py:74 ../data/glade/SalesPersonStep.glade.h:2
+#: ../stoqlib/reporting/sale.py:73 ../data/glade/SalesPersonStep.glade.h:2
#: ../data/glade/SaleDetailsDialog.glade.h:3
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:2
#: ../data/glade/DeliveryEditor.glade.h:4
@@ -689,88 +598,55 @@
msgid "Client:"
msgstr "Kund:"
-#: ../stoqlib/reporting/sale.py:74
+#: ../stoqlib/reporting/sale.py:73
#, fuzzy
msgid "Phone number:"
msgstr "Telefonnummer:"
-#: ../stoqlib/reporting/sale.py:90
+#: ../stoqlib/reporting/sale.py:89
#, fuzzy
msgid "Sub-Total"
msgstr "Totalt"
-#: ../stoqlib/reporting/sale.py:99
+#: ../stoqlib/reporting/sale.py:98
#, python-format
msgid "%s items"
msgstr "%s föremål"
-#: ../stoqlib/reporting/sale.py:101
+#: ../stoqlib/reporting/sale.py:100
#, python-format
msgid "%s item"
msgstr "%s föremål"
-#: ../stoqlib/reporting/sale.py:111 ../data/glade/SaleDetailsDialog.glade.h:5
+#: ../stoqlib/reporting/sale.py:110 ../data/glade/SaleDetailsDialog.glade.h:5
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:2
#: ../data/glade/SaleDiscountSlave.glade.h:3
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:3
#: ../data/glade/RenegotiationDetailsDialog.glade.h:5
-#: ../data/glade/PurchaseDetailsDialog.glade.h:6
+#: ../data/glade/PurchaseDetailsDialog.glade.h:4
msgid "Discount:"
msgstr "Rabatt:"
-#: ../stoqlib/reporting/sale.py:125
-#, fuzzy
-msgid "Additional Instructions:"
-msgstr "Extra _instruktioner"
-
-#: ../stoqlib/reporting/sale.py:138
-#, fuzzy
-msgid "Delivery Address:"
-msgstr "Huvudaddress"
+#: ../stoqlib/reporting/sale.py:121 ../stoqlib/gui/wizards/salewizard.py:359
+#: ../stoqlib/gui/wizards/salequotewizard.py:128
+#: ../stoqlib/gui/slaves/receivingslave.py:125
+msgid "Additional Information"
+msgstr ""
-#: ../stoqlib/reporting/sale.py:146
+#: ../stoqlib/reporting/sale.py:129
#, fuzzy, python-format
msgid "Sale Order on %s"
msgstr "Försäljningsorder"
-#: ../stoqlib/reporting/sale.py:152
+#: ../stoqlib/reporting/sale.py:135
msgid "Sales Report"
msgstr "Försäljningsrapport"
-#: ../stoqlib/reporting/sale.py:153
+#: ../stoqlib/reporting/sale.py:136
msgid "sales"
msgstr "försäljning"
-#: ../stoqlib/reporting/sale.py:172 ../stoqlib/reporting/till.py:54
-#: ../stoqlib/gui/search/fiscalsearch.py:123
-#: ../stoqlib/gui/search/commissionsearch.py:81
-#: ../stoqlib/gui/search/tillsearch.py:116
-#: ../stoqlib/gui/dialogs/tillhistory.py:63
-#: ../stoqlib/gui/dialogs/clientdetails.py:125
-#: ../stoqlib/gui/dialogs/supplierdetails.py:121
-#: ../stoqlib/gui/dialogs/productstockdetails.py:129
-#: ../data/glade/FiscalMemoryEditor.glade.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: ../stoqlib/reporting/sale.py:174 ../stoqlib/gui/editors/personeditor.py:57
-#: ../stoqlib/gui/search/salesearch.py:72
-#: ../stoqlib/gui/dialogs/productstockdetails.py:149
-msgid "Client"
-msgstr "Klient"
-
-#: ../stoqlib/reporting/sale.py:177 ../stoqlib/gui/search/salesearch.py:75
-#: ../stoqlib/gui/search/commissionsearch.py:71
-#: ../stoqlib/gui/dialogs/clientdetails.py:127
-msgid "Salesperson"
-msgstr "Säljare"
-
-#: ../stoqlib/reporting/sale.py:190
-#, python-format
-msgid "Total %s"
-msgstr "Totalt %s"
-
-#: ../stoqlib/reporting/sale.py:202 ../stoqlib/lib/parameters.py:71
+#: ../stoqlib/reporting/sale.py:158 ../stoqlib/lib/parameters.py:71
#: ../stoqlib/lib/parameters.py:102 ../stoqlib/lib/parameters.py:116
#: ../stoqlib/lib/parameters.py:122 ../stoqlib/lib/parameters.py:130
#: ../stoqlib/lib/parameters.py:154 ../stoqlib/lib/parameters.py:166
@@ -785,18 +661,18 @@
msgid "Sales"
msgstr "Försäljning"
-#: ../stoqlib/reporting/sale.py:208
+#: ../stoqlib/reporting/sale.py:164
#, fuzzy, python-format
msgid "sales on branch %s"
msgstr "Alla avdelningar"
-#: ../stoqlib/reporting/sale.py:211
+#: ../stoqlib/reporting/sale.py:167
#, python-format
msgid "sales from %s on branch %s"
msgstr ""
#. ListDialog
-#: ../stoqlib/reporting/sale.py:223 ../stoqlib/gui/search/stationsearch.py:57
+#: ../stoqlib/reporting/sale.py:179 ../stoqlib/gui/search/stationsearch.py:57
#: ../stoqlib/gui/search/personsearch.py:111
#: ../stoqlib/gui/search/personsearch.py:140
#: ../stoqlib/gui/search/personsearch.py:179
@@ -809,70 +685,61 @@
msgid "Name"
msgstr "Namn"
-#: ../stoqlib/reporting/sale.py:228
+#: ../stoqlib/reporting/sale.py:184
#, fuzzy
msgid "Total Amount"
msgstr "Totalt %s"
-#: ../stoqlib/reporting/sale.py:230
+#: ../stoqlib/reporting/sale.py:186
msgid "P/A"
msgstr ""
-#: ../stoqlib/reporting/sale.py:232
+#: ../stoqlib/reporting/sale.py:188
#, fuzzy
msgid "Percentage"
msgstr "Guernsey"
-#: ../stoqlib/reporting/sale.py:237
+#: ../stoqlib/reporting/sale.py:193
msgid "S/P"
msgstr ""
-#: ../stoqlib/reporting/sale.py:272
+#: ../stoqlib/reporting/sale.py:228
#, python-format
msgid "Sold value per sales %s"
msgstr ""
-#: ../stoqlib/reporting/sale.py:279
+#: ../stoqlib/reporting/sale.py:235
#, fuzzy
msgid "P/A: Payment Amount"
msgstr "Betalningsmetod"
-#: ../stoqlib/reporting/sale.py:280
+#: ../stoqlib/reporting/sale.py:236
msgid "S/P: Sellables sold per sale"
msgstr ""
-#: ../stoqlib/reporting/sale.py:283
+#: ../stoqlib/reporting/sale.py:239
#, fuzzy, python-format
msgid "Total of sales: %d"
msgstr "Noteringar:"
-#: ../stoqlib/reporting/purchase_receival.py:35
+#: ../stoqlib/reporting/purchase_receival.py:34
msgid "Purchase Receival Report"
msgstr ""
-#: ../stoqlib/reporting/purchase_receival.py:36
+#: ../stoqlib/reporting/purchase_receival.py:35
msgid "purchase receivals"
msgstr ""
-#: ../stoqlib/reporting/purchase_receival.py:46
-msgid "Received Date"
-msgstr ""
-
-#: ../stoqlib/reporting/purchase_receival.py:54
-#: ../stoqlib/gui/search/receivingsearch.py:83
-msgid "Invoice #"
-msgstr "Faktura #"
-
-#: ../stoqlib/reporting/purchase_receival.py:55
+#: ../stoqlib/reporting/purchase_receival.py:47
#: ../stoqlib/gui/search/receivingsearch.py:85
msgid "Invoice Total"
msgstr ""
-#: ../stoqlib/reporting/till.py:38
+#: ../stoqlib/reporting/till.py:37
msgid "Till History Listing"
msgstr ""
-#: ../stoqlib/reporting/till.py:39
+#: ../stoqlib/reporting/till.py:38
msgid "till history"
msgstr ""
@@ -926,7 +793,7 @@
#: ../stoqlib/lib/parameters.py:77 ../stoqlib/lib/parameters.py:83
#: ../stoqlib/lib/parameters.py:89 ../stoqlib/lib/parameters.py:220
-#: ../stoqlib/lib/invoice.py:302
+#: ../stoqlib/lib/invoice.py:304
msgid "Purchase"
msgstr ""
@@ -980,7 +847,7 @@
msgstr ""
#: ../stoqlib/lib/parameters.py:107
-#: ../stoqlib/gui/search/sellablesearch.py:126
+#: ../stoqlib/gui/search/sellablesearch.py:128
#: ../stoqlib/gui/wizards/stocktransferwizard.py:116
msgid "Stock"
msgstr "Lager"
@@ -1271,158 +1138,158 @@
msgid "There is no defined %s parameter datain the database."
msgstr ""
-#: ../stoqlib/lib/invoice.py:294 ../stoqlib/gui/search/commissionsearch.py:69
+#: ../stoqlib/lib/invoice.py:296 ../stoqlib/gui/search/commissionsearch.py:69
#, fuzzy
msgid "Sale"
msgstr "Våg"
-#: ../stoqlib/lib/invoice.py:339
+#: ../stoqlib/lib/invoice.py:341
msgid "Company document number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:350
+#: ../stoqlib/lib/invoice.py:352
#, fuzzy
msgid "Outgoing invoice"
msgstr "faktura"
-#: ../stoqlib/lib/invoice.py:361
+#: ../stoqlib/lib/invoice.py:363
#, fuzzy
msgid "Incoming invoice"
msgstr "faktura"
-#: ../stoqlib/lib/invoice.py:371
+#: ../stoqlib/lib/invoice.py:373
#, fuzzy
msgid "Client name"
msgstr "Klient"
-#: ../stoqlib/lib/invoice.py:381
+#: ../stoqlib/lib/invoice.py:383
#, fuzzy
msgid "Client Address"
msgstr "Huvudaddress"
-#: ../stoqlib/lib/invoice.py:391
+#: ../stoqlib/lib/invoice.py:393
msgid "Client's document number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:407
+#: ../stoqlib/lib/invoice.py:409
#, fuzzy
msgid "Client's district"
msgstr "Klient"
-#: ../stoqlib/lib/invoice.py:417
+#: ../stoqlib/lib/invoice.py:419
msgid "Client's postal code"
msgstr ""
-#: ../stoqlib/lib/invoice.py:427
+#: ../stoqlib/lib/invoice.py:429
#, fuzzy
msgid "Client's city"
msgstr "Klient"
-#: ../stoqlib/lib/invoice.py:437
+#: ../stoqlib/lib/invoice.py:439
#, fuzzy
msgid "Client Phone number"
msgstr "Telefonnummer"
-#: ../stoqlib/lib/invoice.py:446
+#: ../stoqlib/lib/invoice.py:448
#, fuzzy
msgid "Client Fax number"
msgstr "Sök"
-#: ../stoqlib/lib/invoice.py:455
+#: ../stoqlib/lib/invoice.py:457
#, fuzzy
msgid "Client Phone/Fax number"
msgstr "Telefonnummer"
-#: ../stoqlib/lib/invoice.py:467
+#: ../stoqlib/lib/invoice.py:469
msgid "Client state abbreviation"
msgstr ""
-#: ../stoqlib/lib/invoice.py:477
+#: ../stoqlib/lib/invoice.py:479
msgid "Clients state registry number or document number"
msgstr ""
-#: ../stoqlib/lib/invoice.py:491
+#: ../stoqlib/lib/invoice.py:493
msgid "Emission date"
msgstr ""
-#: ../stoqlib/lib/invoice.py:501
+#: ../stoqlib/lib/invoice.py:503
#, fuzzy
msgid "Creation date"
msgstr "Betalad"
-#: ../stoqlib/lib/invoice.py:511
+#: ../stoqlib/lib/invoice.py:513
msgid "Creation time"
msgstr ""
-#: ../stoqlib/lib/invoice.py:521
+#: ../stoqlib/lib/invoice.py:523
#, fuzzy
msgid "Number of payments"
msgstr "Antal delbetalningar:"
-#: ../stoqlib/lib/invoice.py:531
+#: ../stoqlib/lib/invoice.py:533
#, fuzzy
msgid "Payment due dates"
msgstr "Betalningstyp"
-#: ../stoqlib/lib/invoice.py:541
+#: ../stoqlib/lib/invoice.py:544
#, fuzzy
msgid "Payment values"
msgstr "Betalningstyp"
-#: ../stoqlib/lib/invoice.py:696
+#: ../stoqlib/lib/invoice.py:699
#, fuzzy
msgid "Product item counter"
msgstr "Produktföremål"
-#: ../stoqlib/lib/invoice.py:708
+#: ../stoqlib/lib/invoice.py:711
msgid "Product item code / description"
msgstr ""
-#: ../stoqlib/lib/invoice.py:724
+#: ../stoqlib/lib/invoice.py:727
#, fuzzy
msgid "Product item description"
msgstr "Varulistning"
-#: ../stoqlib/lib/invoice.py:737
+#: ../stoqlib/lib/invoice.py:740
#, fuzzy
msgid "Product item code"
msgstr "Produktföremål"
-#: ../stoqlib/lib/invoice.py:751
+#: ../stoqlib/lib/invoice.py:754
#, fuzzy
msgid "Product item situation"
msgstr "Varulistning"
-#: ../stoqlib/lib/invoice.py:764
+#: ../stoqlib/lib/invoice.py:767
#, fuzzy
msgid "Product item unit"
msgstr "Produktföremål"
-#: ../stoqlib/lib/invoice.py:777
+#: ../stoqlib/lib/invoice.py:780
#, fuzzy
msgid "Product item quantity"
msgstr "Produktföremål"
-#: ../stoqlib/lib/invoice.py:790
+#: ../stoqlib/lib/invoice.py:793
#, fuzzy
msgid "Product item price"
msgstr "Produktföremål"
-#: ../stoqlib/lib/invoice.py:803
+#: ../stoqlib/lib/invoice.py:806
msgid "Product item total (price * quantity)"
msgstr ""
-#: ../stoqlib/lib/invoice.py:816
+#: ../stoqlib/lib/invoice.py:819
#, fuzzy
msgid "Product item tax"
msgstr "Produktföremål"
-#: ../stoqlib/lib/invoice.py:834
+#: ../stoqlib/lib/invoice.py:837
#, fuzzy
msgid "Invoice Type"
msgstr "Enhetsttyp"
-#: ../stoqlib/lib/invoice.py:855
+#: ../stoqlib/lib/invoice.py:858
msgid "State registry number"
msgstr ""
@@ -2406,23 +2273,23 @@
msgid "You need to have a State Registry set on Company %s"
msgstr ""
-#: ../stoqlib/lib/defaults.py:58 ../stoqlib/domain/product.py:111
+#: ../stoqlib/lib/defaults.py:59 ../stoqlib/domain/product.py:111
msgid "Days"
msgstr "Dagar"
-#: ../stoqlib/lib/defaults.py:59
+#: ../stoqlib/lib/defaults.py:60
msgid "Weeks"
msgstr "Veckor"
-#: ../stoqlib/lib/defaults.py:60
+#: ../stoqlib/lib/defaults.py:61
msgid "Months"
msgstr "Månader"
-#: ../stoqlib/lib/defaults.py:61
+#: ../stoqlib/lib/defaults.py:62
msgid "Years"
msgstr "År"
-#: ../stoqlib/lib/defaults.py:155
+#: ../stoqlib/lib/defaults.py:156
msgid "All branches"
msgstr "Alla avdelningar"
@@ -2743,6 +2610,13 @@
msgid "Layout"
msgstr "Mayotte"
+#: ../stoqlib/gui/editors/personeditor.py:57
+#: ../stoqlib/gui/search/salesearch.py:72
+#: ../stoqlib/gui/search/salesearch.py:129
+#: ../stoqlib/gui/dialogs/productstockdetails.py:149
+msgid "Client"
+msgstr "Klient"
+
#: ../stoqlib/gui/editors/personeditor.py:58
#, fuzzy
msgid "New Client"
@@ -2802,6 +2676,18 @@
msgid "Role Name:"
msgstr ""
+#: ../stoqlib/gui/editors/personeditor.py:249
+#: ../stoqlib/gui/editors/producteditor.py:370
+#: ../stoqlib/gui/editors/producteditor.py:390
+#: ../stoqlib/gui/search/receivingsearch.py:81
+#: ../stoqlib/gui/wizards/receivingwizard.py:103
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:184
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:354
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:470
+#: ../stoqlib/gui/dialogs/productstockdetails.py:133
+msgid "Supplier"
+msgstr "Leverantör"
+
#: ../stoqlib/gui/editors/personeditor.py:250
msgid "New Supplier"
msgstr "Ny leverantör"
@@ -2814,6 +2700,11 @@
msgid "New Transporter"
msgstr ""
+#: ../stoqlib/gui/editors/personeditor.py:297
+#: ../stoqlib/gui/search/stationsearch.py:63 ../stoqlib/gui/base/search.py:353
+msgid "Branch"
+msgstr "Avdelning"
+
#: ../stoqlib/gui/editors/personeditor.py:298
msgid "New Branch"
msgstr "Ny avdelningSök"
@@ -2828,10 +2719,10 @@
#: ../stoqlib/gui/editors/categoryeditor.py:94
#: ../stoqlib/gui/editors/producteditor.py:126
-#: ../stoqlib/gui/search/productsearch.py:152
-#: ../stoqlib/gui/search/productsearch.py:273
+#: ../stoqlib/gui/search/productsearch.py:154
+#: ../stoqlib/gui/search/productsearch.py:275
#: ../stoqlib/gui/wizards/salequotewizard.py:171
-#: ../stoqlib/gui/wizards/purchasewizard.py:237
+#: ../stoqlib/gui/wizards/purchasewizard.py:243
#: ../stoqlib/gui/dialogs/paymentcategorydialog.py:50
msgid "Category"
msgstr "Kategori"
@@ -2875,42 +2766,72 @@
msgid "This unit type requires weighing"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:324
+#: ../stoqlib/gui/editors/sellableeditor.py:241
+#, fuzzy
+msgid "Do you really want to delete?"
+msgstr "Är du säker på att du vill radera dessa föremål?"
+
+#: ../stoqlib/gui/editors/sellableeditor.py:242
+#: ../stoqlib/gui/editors/parameterseditor.py:108
+#: ../stoqlib/gui/search/parametersearch.py:92
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
+#: ../stoqlib/gui/wizards/personwizard.py:97
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:392
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:498
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:537
+#: ../stoqlib/gui/dialogs/productstockdetails.py:183
+#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
+msgid "Yes"
+msgstr "Ja"
+
+#: ../stoqlib/gui/editors/sellableeditor.py:242
+#: ../stoqlib/gui/editors/parameterseditor.py:114
+#: ../stoqlib/gui/search/parametersearch.py:92
+#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:392
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:498
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:537
+#: ../stoqlib/gui/dialogs/productstockdetails.py:183
+#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
+msgid "No"
+msgstr "Nej"
+
+#: ../stoqlib/gui/editors/sellableeditor.py:337
msgid "No unit"
msgstr "Ingen enhet"
-#: ../stoqlib/gui/editors/sellableeditor.py:327
+#: ../stoqlib/gui/editors/sellableeditor.py:340
msgid "Specify:"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:385
+#: ../stoqlib/gui/editors/sellableeditor.py:398
#, fuzzy
msgid "The code can not be empty."
msgstr "Säljpriset kan inte vara 0"
-#: ../stoqlib/gui/editors/sellableeditor.py:387
+#: ../stoqlib/gui/editors/sellableeditor.py:400
#, python-format
msgid "The code %s already exists."
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:393
+#: ../stoqlib/gui/editors/sellableeditor.py:406
msgid "Barcode must have 14 digits or less."
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:395
+#: ../stoqlib/gui/editors/sellableeditor.py:408
#, python-format
msgid "The barcode %s already exists"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:399
+#: ../stoqlib/gui/editors/sellableeditor.py:412
msgid "Price cannot be zero or negative"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:403
+#: ../stoqlib/gui/editors/sellableeditor.py:416
msgid "Cost cannot be zero or negative"
msgstr ""
-#: ../stoqlib/gui/editors/sellableeditor.py:408
+#: ../stoqlib/gui/editors/sellableeditor.py:421
msgid "Unit must have a description"
msgstr ""
@@ -2926,7 +2847,7 @@
msgstr "Tjänst"
#: ../stoqlib/gui/editors/serviceeditor.py:78
-#: ../stoqlib/gui/wizards/purchasewizard.py:495
+#: ../stoqlib/gui/wizards/purchasewizard.py:505
msgid "Expected receival date must be set to a future date"
msgstr ""
@@ -2940,29 +2861,6 @@
msgid "Cat 52 directory selection"
msgstr ""
-#: ../stoqlib/gui/editors/parameterseditor.py:108
-#: ../stoqlib/gui/search/parametersearch.py:92
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
-#: ../stoqlib/gui/wizards/personwizard.py:97
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:390
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:495
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:534
-#: ../stoqlib/gui/dialogs/productstockdetails.py:183
-#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
-msgid "Yes"
-msgstr "Ja"
-
-#: ../stoqlib/gui/editors/parameterseditor.py:114
-#: ../stoqlib/gui/search/parametersearch.py:92
-#: ../stoqlib/gui/wizards/stocktransferwizard.py:270
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:390
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:495
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:534
-#: ../stoqlib/gui/dialogs/productstockdetails.py:183
-#: ../stoqlib/gui/base/dialogs.py:460 ../stoqlib/gui/slaves/saleslave.py:332
-msgid "No"
-msgstr "Nej"
-
#: ../stoqlib/gui/editors/parameterseditor.py:128
#, python-format
msgid "Edit '%s' Parameter"
@@ -3112,9 +3010,8 @@
msgstr ""
#: ../stoqlib/gui/editors/producteditor.py:458
-#: ../stoqlib/gui/editors/producteditor.py:508
-#: ../stoqlib/gui/editors/producteditor.py:518
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:247
+#: ../stoqlib/gui/editors/producteditor.py:509
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:248
#: ../data/glade/SellableTypeStep.glade.h:2
#: ../data/glade/SellableEditor.glade.h:10
msgid "Product"
@@ -3191,7 +3088,7 @@
#: ../stoqlib/gui/dialogs/devices.py:54 ../stoqlib/domain/station.py:102
#: ../stoqlib/domain/devices.py:155 ../stoqlib/domain/person.py:373
#: ../stoqlib/domain/person.py:590 ../stoqlib/domain/person.py:668
-#: ../stoqlib/domain/person.py:700 ../stoqlib/domain/person.py:1059
+#: ../stoqlib/domain/person.py:700 ../stoqlib/domain/person.py:1060
#: ../stoqlib/domain/test/test_person.py:510
#: ../stoqlib/domain/test/test_person.py:519
#: ../stoqlib/domain/payment/method.py:147
@@ -3203,26 +3100,26 @@
msgid "Active"
msgstr "Aktiv"
-#: ../stoqlib/gui/search/servicesearch.py:48
+#: ../stoqlib/gui/search/servicesearch.py:49
msgid "Service Search"
msgstr "Tjänstsökning"
-#: ../stoqlib/gui/search/servicesearch.py:54
+#: ../stoqlib/gui/search/servicesearch.py:55
msgid "Add services"
msgstr "Lägg till tjänster"
-#: ../stoqlib/gui/search/servicesearch.py:55
+#: ../stoqlib/gui/search/servicesearch.py:56
msgid "service"
msgstr "tjänst"
-#: ../stoqlib/gui/search/servicesearch.py:67
+#: ../stoqlib/gui/search/servicesearch.py:68
#: ../stoqlib/gui/search/personsearch.py:311
-#: ../stoqlib/gui/search/productsearch.py:89
+#: ../stoqlib/gui/search/productsearch.py:90
msgid "matching"
msgstr ""
-#: ../stoqlib/gui/search/servicesearch.py:73
-#: ../stoqlib/gui/search/productsearch.py:97
+#: ../stoqlib/gui/search/servicesearch.py:74
+#: ../stoqlib/gui/search/productsearch.py:98
#, fuzzy
msgid "_Table of Price"
msgstr " Pris:"
@@ -3230,26 +3127,26 @@
#. if not items:
#. raise ValueError('You should have at least one branch at '
#. 'this point')
-#: ../stoqlib/gui/search/servicesearch.py:90
+#: ../stoqlib/gui/search/servicesearch.py:91
#: ../stoqlib/gui/search/personsearch.py:91
#: ../stoqlib/gui/search/personsearch.py:97
#: ../stoqlib/gui/search/personsearch.py:223
#: ../stoqlib/gui/search/personsearch.py:262
#: ../stoqlib/gui/search/personsearch.py:322
-#: ../stoqlib/gui/search/productsearch.py:134
+#: ../stoqlib/gui/search/productsearch.py:135
#: ../stoqlib/gui/search/salesearch.py:62
#: ../stoqlib/gui/search/tillsearch.py:105
-#: ../stoqlib/gui/search/paymentsearch.py:55 ../stoqlib/gui/base/search.py:300
+#: ../stoqlib/gui/search/paymentsearch.py:55 ../stoqlib/gui/base/search.py:350
msgid "Any"
msgstr "Vilken som helst"
-#: ../stoqlib/gui/search/servicesearch.py:91
+#: ../stoqlib/gui/search/servicesearch.py:92
msgid "Show services with status"
msgstr ""
-#: ../stoqlib/gui/search/servicesearch.py:108
-#: ../stoqlib/gui/search/productsearch.py:150
-#: ../stoqlib/gui/search/sellablesearch.py:120
+#: ../stoqlib/gui/search/servicesearch.py:109
+#: ../stoqlib/gui/search/productsearch.py:152
+#: ../stoqlib/gui/search/sellablesearch.py:122
msgid "Barcode"
msgstr "Streckkod"
@@ -3297,6 +3194,22 @@
msgid "Registry Number"
msgstr ""
+#: ../stoqlib/gui/search/personsearch.py:116
+#: ../stoqlib/gui/search/personsearch.py:336
+#: ../stoqlib/gui/search/paymentsearch.py:82
+#: ../stoqlib/gui/wizards/purchasefinishwizard.py:133
+#: ../stoqlib/gui/wizards/renegotiationwizard.py:92
+#: ../stoqlib/gui/dialogs/renegotiationdetails.py:131
+#: ../stoqlib/gui/dialogs/saledetails.py:152
+#: ../stoqlib/gui/dialogs/clientdetails.py:129
+#: ../stoqlib/gui/dialogs/clientdetails.py:164
+#: ../stoqlib/gui/dialogs/supplierdetails.py:123
+#: ../stoqlib/gui/dialogs/supplierdetails.py:149
+#: ../stoqlib/gui/dialogs/purchasedetails.py:177
+#: ../stoqlib/domain/payment/views.py:262
+msgid "Status"
+msgstr "Status"
+
#: ../stoqlib/gui/search/personsearch.py:125
msgid "Supplier Search"
msgstr ""
@@ -3391,7 +3304,7 @@
#: ../stoqlib/domain/devices.py:156 ../stoqlib/domain/person.py:374
#: ../stoqlib/domain/person.py:499 ../stoqlib/domain/person.py:591
#: ../stoqlib/domain/person.py:669 ../stoqlib/domain/person.py:701
-#: ../stoqlib/domain/person.py:1061 ../stoqlib/domain/test/test_person.py:462
+#: ../stoqlib/domain/person.py:1062 ../stoqlib/domain/test/test_person.py:462
#: ../stoqlib/domain/test/test_person.py:473
#: ../stoqlib/domain/payment/method.py:148 ../plugins/ecf/ecfdomain.py:205
#: ../data/glade/BranchDetailsSlave.glade.h:3
@@ -3508,15 +3421,30 @@
msgid "ISS Total:"
msgstr "Noteringar:"
+#: ../stoqlib/gui/search/fiscalsearch.py:123
+#: ../stoqlib/gui/search/commissionsearch.py:81
+#: ../stoqlib/gui/search/tillsearch.py:116
+#: ../stoqlib/gui/dialogs/tillhistory.py:63
+#: ../stoqlib/gui/dialogs/clientdetails.py:125
+#: ../stoqlib/gui/dialogs/supplierdetails.py:121
+#: ../stoqlib/gui/dialogs/productstockdetails.py:129
+#: ../data/glade/FiscalMemoryEditor.glade.h:2
+msgid "Date"
+msgstr "Datum"
+
#: ../stoqlib/gui/search/fiscalsearch.py:125
#: ../stoqlib/gui/dialogs/productstockdetails.py:135
msgid "Invoice"
msgstr "faktura"
+#: ../stoqlib/gui/search/fiscalsearch.py:128
+msgid "Drawee"
+msgstr ""
+
#. Branch
#: ../stoqlib/gui/search/fiscalsearch.py:151
-#: ../stoqlib/gui/search/productsearch.py:127
-#: ../stoqlib/gui/search/productsearch.py:216
+#: ../stoqlib/gui/search/productsearch.py:128
+#: ../stoqlib/gui/search/productsearch.py:218
#: ../stoqlib/gui/search/purchasesearch.py:63
#, fuzzy
msgid "In branch:"
@@ -3605,8 +3533,8 @@
#. Date
#: ../stoqlib/gui/search/transfersearch.py:85
-#: ../stoqlib/gui/search/productsearch.py:211
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:341
+#: ../stoqlib/gui/search/productsearch.py:213
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:343
#: ../stoqlib/gui/dialogs/tillhistory.py:75
#: ../data/glade/EmployeeDetailsSlave.glade.h:7
#: ../data/glade/ProductsAdjustment.glade.h:3
@@ -3616,7 +3544,7 @@
msgstr "Datum:"
#: ../stoqlib/gui/search/transfersearch.py:90
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:354
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:356
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:144
#, fuzzy
msgid "Open Date"
@@ -3637,40 +3565,40 @@
msgid "Number of items transferred"
msgstr "Antal delbetalningar:"
-#: ../stoqlib/gui/search/productsearch.py:57
+#: ../stoqlib/gui/search/productsearch.py:58
msgid "Product Search"
msgstr "Varusökning"
-#: ../stoqlib/gui/search/productsearch.py:62
+#: ../stoqlib/gui/search/productsearch.py:63
msgid "Add products"
msgstr "Lägg till varor"
-#: ../stoqlib/gui/search/productsearch.py:63
-#: ../stoqlib/gui/search/productsearch.py:249
+#: ../stoqlib/gui/search/productsearch.py:64
+#: ../stoqlib/gui/search/productsearch.py:251
msgid "product"
msgstr "vara"
-#: ../stoqlib/gui/search/productsearch.py:135
+#: ../stoqlib/gui/search/productsearch.py:136
msgid "with status:"
msgstr "med status:"
-#: ../stoqlib/gui/search/productsearch.py:156
-#: ../stoqlib/gui/search/productsearch.py:277
+#: ../stoqlib/gui/search/productsearch.py:158
+#: ../stoqlib/gui/search/productsearch.py:279
#, fuzzy
msgid "Location"
msgstr "Semester"
-#: ../stoqlib/gui/search/productsearch.py:194
+#: ../stoqlib/gui/search/productsearch.py:196
#, fuzzy
msgid "Product History Search"
msgstr "Varusökning"
-#: ../stoqlib/gui/search/productsearch.py:244
+#: ../stoqlib/gui/search/productsearch.py:246
#, fuzzy
msgid "Product Stock Search"
msgstr "Varusökning"
-#: ../stoqlib/gui/search/productsearch.py:288
+#: ../stoqlib/gui/search/productsearch.py:290
msgid "Difference"
msgstr ""
@@ -3683,18 +3611,56 @@
msgid "Show sales with status"
msgstr "med status:"
+#: ../stoqlib/gui/search/salesearch.py:68
+#: ../stoqlib/gui/search/paymentsearch.py:76
+#: ../stoqlib/gui/wizards/receivingwizard.py:97
+#: ../stoqlib/gui/dialogs/tillhistory.py:61
+msgid "Number"
+msgstr "Nummer"
+
#: ../stoqlib/gui/search/salesearch.py:70
-#: ../stoqlib/gui/wizards/receivingwizard.py:98
+#: ../stoqlib/gui/wizards/receivingwizard.py:99
#: ../stoqlib/gui/dialogs/productstockdetails.py:146
msgid "Date Started"
msgstr ""
+#: ../stoqlib/gui/search/salesearch.py:75
+#: ../stoqlib/gui/search/commissionsearch.py:71
+#: ../stoqlib/gui/dialogs/clientdetails.py:127
+msgid "Salesperson"
+msgstr "Säljare"
+
#: ../stoqlib/gui/search/salesearch.py:77
-#: ../data/glade/SaleDetailsDialog.glade.h:6
+#: ../data/glade/SaleDetailsDialog.glade.h:7
#: ../data/glade/RenegotiationDetailsDialog.glade.h:6
msgid "Items"
msgstr "Föremål"
+#: ../stoqlib/gui/search/salesearch.py:115
+#, fuzzy
+msgid "Delivery Search"
+msgstr "Sök"
+
+#: ../stoqlib/gui/search/salesearch.py:122
+msgid "Items matching:"
+msgstr ""
+
+#: ../stoqlib/gui/search/salesearch.py:125
+#: ../stoqlib/gui/search/purchasesearch.py:76
+#, fuzzy
+msgid "# "
+msgstr "#"
+
+#: ../stoqlib/gui/search/salesearch.py:132
+#, fuzzy
+msgid "Estimated Date"
+msgstr "Beräknat leverans_datum:"
+
+#: ../stoqlib/gui/search/salesearch.py:134
+#, fuzzy
+msgid "Completion Date"
+msgstr "Betalad"
+
#: ../stoqlib/gui/search/commissionsearch.py:46
#, fuzzy
msgid "Search for Commissions"
@@ -3751,16 +3717,15 @@
msgid "Receival Date"
msgstr ""
+#: ../stoqlib/gui/search/receivingsearch.py:83
+msgid "Invoice #"
+msgstr "Faktura #"
+
#: ../stoqlib/gui/search/purchasesearch.py:43
#, fuzzy
msgid "Purchased Items Search"
msgstr "Välj föremål"
-#: ../stoqlib/gui/search/purchasesearch.py:76
-#, fuzzy
-msgid "# "
-msgstr "#"
-
#: ../stoqlib/gui/search/purchasesearch.py:80
#, fuzzy
msgid "Purchased"
@@ -3775,25 +3740,25 @@
msgid "Expected receival"
msgstr ""
-#: ../stoqlib/gui/search/sellablesearch.py:50
+#: ../stoqlib/gui/search/sellablesearch.py:51
#, fuzzy
msgid "Search for sale items"
msgstr "Välj föremål:"
-#: ../stoqlib/gui/search/sellablesearch.py:55
+#: ../stoqlib/gui/search/sellablesearch.py:56
msgid "_Add sale items"
msgstr ""
-#: ../stoqlib/gui/search/sellablesearch.py:56
+#: ../stoqlib/gui/search/sellablesearch.py:57
msgid "sale item"
msgstr ""
-#: ../stoqlib/gui/search/sellablesearch.py:56
+#: ../stoqlib/gui/search/sellablesearch.py:57
#, fuzzy
msgid "sale items"
msgstr "Välj föremål"
-#: ../stoqlib/gui/search/sellablesearch.py:84
+#: ../stoqlib/gui/search/sellablesearch.py:85
msgid "Show items matching:"
msgstr ""
@@ -3818,7 +3783,7 @@
msgstr ""
#: ../stoqlib/gui/search/parametersearch.py:68
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:350
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:352
msgid "Group"
msgstr "Grupp"
@@ -3839,19 +3804,29 @@
msgid "Bill or check number:"
msgstr "Sök"
+#: ../stoqlib/gui/search/paymentsearch.py:70
+#, fuzzy
+msgid "Bank"
+msgstr "Bank:"
+
#: ../stoqlib/gui/search/paymentsearch.py:72
#, fuzzy
msgid "Branch Number"
msgstr "Sök"
+#: ../stoqlib/gui/search/paymentsearch.py:74
+#, fuzzy
+msgid "Account"
+msgstr "Konto:"
+
#: ../stoqlib/gui/search/paymentsearch.py:78
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:128
#: ../stoqlib/gui/wizards/renegotiationwizard.py:90
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:126
-#: ../stoqlib/gui/dialogs/saledetails.py:154
+#: ../stoqlib/gui/dialogs/saledetails.py:147
#: ../stoqlib/gui/dialogs/clientdetails.py:162
#: ../stoqlib/gui/dialogs/supplierdetails.py:147
-#: ../stoqlib/gui/dialogs/purchasedetails.py:189
+#: ../stoqlib/gui/dialogs/purchasedetails.py:172
#: ../stoqlib/gui/slaves/paymentslave.py:1038
#: ../stoqlib/domain/payment/views.py:260
msgid "Due Date"
@@ -3860,8 +3835,8 @@
#: ../stoqlib/gui/search/paymentsearch.py:80
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:131
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:129
-#: ../stoqlib/gui/dialogs/saledetails.py:157
-#: ../stoqlib/gui/dialogs/purchasedetails.py:192
+#: ../stoqlib/gui/dialogs/saledetails.py:150
+#: ../stoqlib/gui/dialogs/purchasedetails.py:175
#, fuzzy
msgid "Paid Date"
msgstr "Betalad"
@@ -3882,8 +3857,8 @@
#: ../stoqlib/gui/wizards/purchasefinishwizard.py:138
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:136
-#: ../stoqlib/gui/dialogs/saledetails.py:164
-#: ../stoqlib/gui/dialogs/purchasedetails.py:200
+#: ../stoqlib/gui/dialogs/saledetails.py:157
+#: ../stoqlib/gui/dialogs/purchasedetails.py:183
#, fuzzy
msgid "Paid Value"
msgstr "Betalad"
@@ -3916,12 +3891,6 @@
msgid "Client %s does not have enought credit left."
msgstr ""
-#: ../stoqlib/gui/wizards/salewizard.py:359
-#: ../stoqlib/gui/wizards/salequotewizard.py:128
-#: ../stoqlib/gui/slaves/receivingslave.py:119
-msgid "Additional Information"
-msgstr ""
-
#: ../stoqlib/gui/wizards/salewizard.py:371
msgid "Sale Checkout"
msgstr ""
@@ -3958,7 +3927,7 @@
msgstr ""
#: ../stoqlib/gui/wizards/salequotewizard.py:135
-#: ../stoqlib/gui/wizards/purchasewizard.py:175
+#: ../stoqlib/gui/wizards/purchasewizard.py:181
#, fuzzy
msgid "Total Ordered:"
msgstr "Försäljningsorder"
@@ -3981,47 +3950,52 @@
msgid "Expected receival date must be set to today or a future date"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:241
-#: ../stoqlib/gui/wizards/receivingwizard.py:101
+#: ../stoqlib/gui/wizards/purchasewizard.py:173
+#, fuzzy
+msgid "The expected freight value must be a positive number."
+msgstr "%s kan inte vara mindre än 0"
+
+#: ../stoqlib/gui/wizards/purchasewizard.py:247
+#: ../stoqlib/gui/wizards/receivingwizard.py:102
msgid "Expected Receival"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:303
+#: ../stoqlib/gui/wizards/purchasewizard.py:309
#, fuzzy
msgid "The cost must be greater than zero."
msgstr "%s kan inte vara större än %d%%"
-#: ../stoqlib/gui/wizards/purchasewizard.py:307
+#: ../stoqlib/gui/wizards/purchasewizard.py:313
#, fuzzy
msgid "Quantity must be greater than zero"
msgstr "%s kan inte vara större än %d%%"
-#: ../stoqlib/gui/wizards/purchasewizard.py:311
+#: ../stoqlib/gui/wizards/purchasewizard.py:317
msgid "Quantity below the minimum required by the supplier"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasewizard.py:332
+#: ../stoqlib/gui/wizards/purchasewizard.py:338
#: ../stoqlib/domain/payment/operation.py:115
msgid "Bill"
msgstr "Räkning"
-#: ../stoqlib/gui/wizards/purchasewizard.py:333
+#: ../stoqlib/gui/wizards/purchasewizard.py:339
#: ../stoqlib/domain/payment/operation.py:73
msgid "Check"
msgstr "Check"
-#: ../stoqlib/gui/wizards/purchasewizard.py:334
+#: ../stoqlib/gui/wizards/purchasewizard.py:340
#: ../stoqlib/domain/payment/operation.py:50
#: ../data/glade/BasePaymentAddition.glade.h:4
msgid "Money"
msgstr "Pengar"
-#: ../stoqlib/gui/wizards/purchasewizard.py:541
+#: ../stoqlib/gui/wizards/purchasewizard.py:551
#, fuzzy
msgid "New Order"
msgstr "Försäljningsorder"
-#: ../stoqlib/gui/wizards/purchasewizard.py:542
+#: ../stoqlib/gui/wizards/purchasewizard.py:552
#, fuzzy
msgid "Edit Order"
msgstr "Order"
@@ -4050,93 +4024,93 @@
msgid "Adding a %s"
msgstr ""
-#: ../stoqlib/gui/wizards/receivingwizard.py:105
+#: ../stoqlib/gui/wizards/receivingwizard.py:106
msgid "Qty Ordered"
msgstr ""
-#: ../stoqlib/gui/wizards/receivingwizard.py:111
+#: ../stoqlib/gui/wizards/receivingwizard.py:112
#, fuzzy
msgid "Order Total"
msgstr "Sök"
-#: ../stoqlib/gui/wizards/receivingwizard.py:203
+#: ../stoqlib/gui/wizards/receivingwizard.py:205
#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:4
msgid "Total Received:"
msgstr ""
-#: ../stoqlib/gui/wizards/receivingwizard.py:247
+#: ../stoqlib/gui/wizards/receivingwizard.py:249
#, fuzzy
msgid "Quantity to receive"
msgstr "Välj föremål"
-#: ../stoqlib/gui/wizards/receivingwizard.py:291
+#: ../stoqlib/gui/wizards/receivingwizard.py:299
msgid "Receiving Order"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:110
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:111
msgid "The quote deadline date must be set to today or a future date"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:177
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:178
msgid ""
"No supplier have been found for any of the selected items.\n"
"This quote will be cancelled."
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:185
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:186
#, fuzzy
msgid "Supplied/Total"
msgstr "Noteringar:"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:215
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:216
#, fuzzy, python-format
msgid "%s/%s"
msgstr "%d %s"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:253
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:254
#, fuzzy, python-format
msgid "Products supplied by %s"
msgstr "Varuleverantör"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:267
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:268
#, fuzzy
msgid "Missing Products"
msgstr "Produkter"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:348
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:350
#, fuzzy
msgid "Quote"
msgstr "Antal"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:356
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:358
#, fuzzy
msgid "Deadline"
msgstr "Leverans"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:389
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:391
#, fuzzy, python-format
msgid "Are you sure you want to remove \"%s\" ?"
msgstr "Är du säker på att du vill radera dessa föremål?"
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:493
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:496
msgid ""
"Are you sure you want to cancel this group ? If so, note that all the quotes "
"will be cancelled."
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:532
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:535
msgid "Should we close the quotes used to compose the purchase order ?"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:612
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:615
msgid "New Quote"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:613
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:616
msgid "Edit Quote"
msgstr ""
-#: ../stoqlib/gui/wizards/purchasequotewizard.py:652
+#: ../stoqlib/gui/wizards/purchasequotewizard.py:655
msgid "Receive Quote Wizard"
msgstr ""
@@ -4192,8 +4166,8 @@
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:52
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:212
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:151
-#: ../stoqlib/gui/dialogs/saledetails.py:183
-#: ../stoqlib/gui/dialogs/purchasedetails.py:209
+#: ../stoqlib/gui/dialogs/saledetails.py:176
+#: ../stoqlib/gui/dialogs/purchasedetails.py:192
#: ../stoqlib/gui/slaves/paymentslave.py:903 ../plugins/ecf/ecfdomain.py:250
#, fuzzy
msgid "Payment"
@@ -4217,39 +4191,39 @@
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:210
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:149
-#: ../stoqlib/gui/dialogs/saledetails.py:181
-#: ../stoqlib/gui/dialogs/purchasedetails.py:207
+#: ../stoqlib/gui/dialogs/saledetails.py:174
+#: ../stoqlib/gui/dialogs/purchasedetails.py:190
#: ../stoqlib/gui/dialogs/productstockdetails.py:174
msgid "When"
msgstr ""
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:215
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:154
-#: ../stoqlib/gui/dialogs/saledetails.py:186
-#: ../stoqlib/gui/dialogs/purchasedetails.py:212
+#: ../stoqlib/gui/dialogs/saledetails.py:179
+#: ../stoqlib/gui/dialogs/purchasedetails.py:195
#, fuzzy
msgid "Changed"
msgstr "Avbryt"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:217
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:156
-#: ../stoqlib/gui/dialogs/saledetails.py:188
-#: ../stoqlib/gui/dialogs/purchasedetails.py:214
+#: ../stoqlib/gui/dialogs/saledetails.py:181
+#: ../stoqlib/gui/dialogs/purchasedetails.py:197
#, fuzzy
msgid "From"
msgstr "Från:"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:219
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:158
-#: ../stoqlib/gui/dialogs/saledetails.py:190
-#: ../stoqlib/gui/dialogs/purchasedetails.py:216
+#: ../stoqlib/gui/dialogs/saledetails.py:183
+#: ../stoqlib/gui/dialogs/purchasedetails.py:199
msgid "To"
msgstr "Till"
#: ../stoqlib/gui/dialogs/paymentadditiondialog.py:221
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:160
-#: ../stoqlib/gui/dialogs/saledetails.py:192
-#: ../stoqlib/gui/dialogs/purchasedetails.py:218
+#: ../stoqlib/gui/dialogs/saledetails.py:185
+#: ../stoqlib/gui/dialogs/purchasedetails.py:201
#: ../stoqlib/gui/dialogs/productstockdetails.py:176
#, fuzzy
msgid "Reason"
@@ -4266,15 +4240,15 @@
msgid "Payment Details"
msgstr "Betalningsmetod"
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:42
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:44
msgid "CSV Exporter Dialog"
msgstr ""
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:90
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:92
msgid "Export CSV..."
msgstr ""
-#: ../stoqlib/gui/dialogs/csvexporterdialog.py:97
+#: ../stoqlib/gui/dialogs/csvexporterdialog.py:99
msgid "CSV Files"
msgstr ""
@@ -4478,7 +4452,7 @@
msgstr "Sök"
#: ../stoqlib/gui/dialogs/renegotiationdetails.py:122
-#: ../stoqlib/gui/dialogs/saledetails.py:150
+#: ../stoqlib/gui/dialogs/saledetails.py:143
#: ../stoqlib/gui/dialogs/clientdetails.py:157
#: ../stoqlib/gui/dialogs/supplierdetails.py:142
msgid "Type"
@@ -4517,7 +4491,7 @@
msgid "Sale Details"
msgstr ""
-#: ../stoqlib/gui/dialogs/saledetails.py:232
+#: ../stoqlib/gui/dialogs/saledetails.py:227
#, fuzzy
msgid "Sale Cancellation Details"
msgstr "Sök"
@@ -4583,7 +4557,7 @@
msgid "Purchase Details"
msgstr ""
-#: ../stoqlib/gui/dialogs/purchasedetails.py:174
+#: ../stoqlib/gui/dialogs/purchasedetails.py:157
msgid "Quantity Received"
msgstr ""
@@ -4617,32 +4591,32 @@
msgid "Notification"
msgstr "Dator"
-#: ../stoqlib/gui/base/search.py:157
+#: ../stoqlib/gui/base/search.py:204
msgid "Se_lect Items"
msgstr "_Välj föremål"
-#: ../stoqlib/gui/base/search.py:607
+#: ../stoqlib/gui/base/search.py:657
msgid "This week"
msgstr ""
-#: ../stoqlib/gui/base/search.py:619
+#: ../stoqlib/gui/base/search.py:669
msgid "Last Week"
msgstr ""
-#: ../stoqlib/gui/base/search.py:631
+#: ../stoqlib/gui/base/search.py:681
msgid "Next week"
msgstr ""
-#: ../stoqlib/gui/base/search.py:642
+#: ../stoqlib/gui/base/search.py:692
msgid "This month"
msgstr ""
-#: ../stoqlib/gui/base/search.py:652
+#: ../stoqlib/gui/base/search.py:702
#, fuzzy
msgid "Last month"
msgstr "Totalt %s"
-#: ../stoqlib/gui/base/search.py:662
+#: ../stoqlib/gui/base/search.py:712
msgid "Next month"
msgstr ""
@@ -4689,20 +4663,20 @@
msgid "Sale price can not be 0"
msgstr "Säljpriset kan inte vara 0"
-#: ../stoqlib/gui/slaves/productslave.py:85
+#: ../stoqlib/gui/slaves/productslave.py:82
msgid "Minimum value must be a positive value."
msgstr ""
-#: ../stoqlib/gui/slaves/productslave.py:89
+#: ../stoqlib/gui/slaves/productslave.py:86
#, fuzzy
msgid "Minimum must be lower than the maximum value."
msgstr "%s kan inte vara mindre än 0"
-#: ../stoqlib/gui/slaves/productslave.py:96
+#: ../stoqlib/gui/slaves/productslave.py:93
msgid "Maximum value must be a positive value."
msgstr ""
-#: ../stoqlib/gui/slaves/productslave.py:100
+#: ../stoqlib/gui/slaves/productslave.py:97
#, fuzzy
msgid "Maximum must be greater than the minimum value."
msgstr "%s kan inte vara mindre än 0"
@@ -4724,65 +4698,70 @@
msgid "Select Image"
msgstr "Välj bild"
-#: ../stoqlib/gui/slaves/receivingslave.py:123
+#: ../stoqlib/gui/slaves/receivingslave.py:129
msgid "Receving order number must be between 1 and 999999"
msgstr ""
-#: ../stoqlib/gui/slaves/receivingslave.py:131
+#: ../stoqlib/gui/slaves/receivingslave.py:137
#, python-format
msgid "Invoice %d already exists for supplier %s."
msgstr ""
-#: ../stoqlib/gui/slaves/receivingslave.py:136
+#: ../stoqlib/gui/slaves/receivingslave.py:142
msgid "This field cannot be negative"
msgstr ""
-#: ../stoqlib/gui/slaves/receivingslave.py:176
+#: ../stoqlib/gui/slaves/receivingslave.py:182
msgid "Discount must be greater than zero"
msgstr ""
-#: ../stoqlib/gui/slaves/receivingslave.py:178
+#: ../stoqlib/gui/slaves/receivingslave.py:184
#, python-format
msgid "Discount must be less than %s"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:188
+#: ../stoqlib/gui/slaves/installmentslave.py:204
msgid "Confirm payment"
msgstr "Verifierad betalning"
-#: ../stoqlib/gui/slaves/installmentslave.py:229
+#: ../stoqlib/gui/slaves/installmentslave.py:245
msgid "Due"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:232
+#: ../stoqlib/gui/slaves/installmentslave.py:246
+#, fuzzy
+msgid "Paid date"
+msgstr "Betalad"
+
+#: ../stoqlib/gui/slaves/installmentslave.py:248
msgid "Paid value"
msgstr "Betalad summa"
-#: ../stoqlib/gui/slaves/installmentslave.py:287
+#: ../stoqlib/gui/slaves/installmentslave.py:309
#, python-format
msgid "Paid date must be between %s and today"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:297
+#: ../stoqlib/gui/slaves/installmentslave.py:319
msgid "Penalty can not be less than zero"
msgstr ""
-#: ../stoqlib/gui/slaves/installmentslave.py:306
+#: ../stoqlib/gui/slaves/installmentslave.py:328
#, fuzzy
msgid "Interest can not be less than zero"
msgstr "%s kan inte vara mindre än 0"
-#: ../stoqlib/gui/slaves/installmentslave.py:316
+#: ../stoqlib/gui/slaves/installmentslave.py:338
#, fuzzy, python-format
msgid "Discount can not be greater or equal than %.2f"
msgstr "Rabatten kan inte vara större än %d%%"
-#: ../stoqlib/gui/slaves/installmentslave.py:319
+#: ../stoqlib/gui/slaves/installmentslave.py:341
#, fuzzy
msgid "Discount can not be less than zero"
msgstr "%s kan inte vara mindre än 0"
-#: ../stoqlib/gui/slaves/installmentslave.py:368
+#: ../stoqlib/gui/slaves/installmentslave.py:390
msgid "Supplier: "
msgstr "Leverantör: "
@@ -5040,11 +5019,16 @@
msgstr "avvaktande"
#: ../stoqlib/domain/transfer.py:80 ../stoqlib/domain/purchase.py:145
-#: ../stoqlib/domain/sellable.py:251 ../stoqlib/domain/till.py:88
+#: ../stoqlib/domain/sellable.py:249 ../stoqlib/domain/till.py:88
#: ../stoqlib/domain/inventory.py:168 ../stoqlib/domain/payment/group.py:62
msgid "Closed"
msgstr "Stängd"
+#: ../stoqlib/domain/receiving.py:214
+#, python-format
+msgid "Freight for purchase %s"
+msgstr ""
+
#: ../stoqlib/domain/devices.py:66
msgid "Serial port 1"
msgstr "Seriellport 1"
@@ -5070,81 +5054,101 @@
msgid "Day"
msgstr "Dagar"
-#: ../stoqlib/domain/purchase.py:141 ../stoqlib/domain/sale.py:277
-#: ../stoqlib/domain/inventory.py:169 ../stoqlib/domain/payment/payment.py:77
+#: ../stoqlib/domain/purchase.py:141 ../stoqlib/domain/sale.py:279
+#: ../stoqlib/domain/inventory.py:169 ../stoqlib/domain/payment/payment.py:79
#: ../stoqlib/domain/payment/group.py:63
msgid "Cancelled"
msgstr "Avbryten"
-#: ../stoqlib/domain/purchase.py:142 ../stoqlib/domain/sale.py:281
+#: ../stoqlib/domain/purchase.py:142 ../stoqlib/domain/sale.py:283
msgid "Quoting"
msgstr ""
-#: ../stoqlib/domain/purchase.py:144 ../stoqlib/domain/sale.py:275
-#: ../stoqlib/domain/payment/payment.py:76
+#: ../stoqlib/domain/purchase.py:144 ../stoqlib/domain/sale.py:277
+#: ../stoqlib/domain/payment/payment.py:78
#: ../stoqlib/domain/payment/renegotiation.py:55
#: ../stoqlib/domain/payment/group.py:61
msgid "Confirmed"
msgstr "Verifierad"
-#: ../stoqlib/domain/purchase.py:150 ../data/glade/StartPurchaseStep.glade.h:7
+#: ../stoqlib/domain/purchase.py:150 ../data/glade/StartPurchaseStep.glade.h:6
msgid "FOB"
msgstr ""
-#: ../stoqlib/domain/purchase.py:151 ../data/glade/StartPurchaseStep.glade.h:6
+#: ../stoqlib/domain/purchase.py:151 ../data/glade/StartPurchaseStep.glade.h:4
msgid "CIF"
msgstr ""
-#: ../stoqlib/domain/purchase.py:515
+#: ../stoqlib/domain/purchase.py:508
#, python-format
msgid "quote number %04d"
msgstr ""
-#: ../stoqlib/domain/purchase.py:569
+#: ../stoqlib/domain/purchase.py:562
#, python-format
msgid "%s Money Returned for Purchase %d"
msgstr ""
-#: ../stoqlib/domain/sale.py:274 ../stoqlib/domain/till.py:87
+#: ../stoqlib/domain/sale.py:276 ../stoqlib/domain/till.py:87
#: ../stoqlib/domain/inventory.py:167
msgid "Opened"
msgstr "Öppnad"
-#: ../stoqlib/domain/sale.py:276 ../stoqlib/domain/payment/payment.py:74
+#: ../stoqlib/domain/sale.py:278 ../stoqlib/domain/payment/payment.py:76
#: ../stoqlib/domain/payment/renegotiation.py:56
msgid "Paid"
msgstr "Betalad"
-#: ../stoqlib/domain/sale.py:279
+#: ../stoqlib/domain/sale.py:281
msgid "Returned"
msgstr "Återlämnad"
-#: ../stoqlib/domain/sale.py:280 ../stoqlib/domain/payment/renegotiation.py:57
+#: ../stoqlib/domain/sale.py:282 ../stoqlib/domain/payment/renegotiation.py:57
#, fuzzy
msgid "Renegotiated"
msgstr "Namnlös"
+#: ../stoqlib/domain/sale.py:550
+#, fuzzy, python-format
+msgid "Sale Details: %s"
+msgstr "Sök"
+
+#: ../stoqlib/domain/sale.py:556
+#, fuzzy, python-format
+msgid "Delivery Address: %s"
+msgstr "Huvudaddress"
+
+#: ../stoqlib/domain/sale.py:562
+#, fuzzy, python-format
+msgid "\"%s\" Notes: %s"
+msgstr "Noteringar:"
+
+#: ../stoqlib/domain/sale.py:565
+#, fuzzy, python-format
+msgid "\"%s\" Estimated Fix Date: %s"
+msgstr "Beräknat leverans_datum:"
+
#. The sale was not entirely paid, so we have to payback the
#. till, because the sale amount have already been added in there
-#: ../stoqlib/domain/sale.py:826
+#: ../stoqlib/domain/sale.py:845
#, python-format
msgid "Debit on Till: Sale %d Returned"
msgstr ""
-#: ../stoqlib/domain/sale.py:836
+#: ../stoqlib/domain/sale.py:855
#, python-format
msgid "%s Money Returned for Sale %d"
msgstr ""
-#: ../stoqlib/domain/sellable.py:249
+#: ../stoqlib/domain/sellable.py:247
msgid "Available"
msgstr "Tillgänglig"
-#: ../stoqlib/domain/sellable.py:252 ../stoqlib/domain/person.py:592
+#: ../stoqlib/domain/sellable.py:250 ../stoqlib/domain/person.py:592
msgid "Blocked"
msgstr "Blockerad"
-#: ../stoqlib/domain/sellable.py:541
+#: ../stoqlib/domain/sellable.py:565
#, python-format
msgid ""
"The sellable with barcode '%s' doesn't exists or is not available to be sold"
@@ -5284,20 +5288,20 @@
msgid "Multiple"
msgstr "Flera"
-#: ../stoqlib/domain/payment/payment.py:72
+#: ../stoqlib/domain/payment/payment.py:74
#: ../stoqlib/domain/payment/group.py:60
msgid "Preview"
msgstr ""
-#: ../stoqlib/domain/payment/payment.py:73
+#: ../stoqlib/domain/payment/payment.py:75
msgid "To Pay"
msgstr "Att Betala"
-#: ../stoqlib/domain/payment/payment.py:75
+#: ../stoqlib/domain/payment/payment.py:77
msgid "Reviewing"
msgstr ""
-#: ../stoqlib/domain/payment/payment.py:301
+#: ../stoqlib/domain/payment/payment.py:304
msgid "NOT PAID"
msgstr "INTE BETALAD"
@@ -5327,17 +5331,17 @@
msgid "%s/%s %s for %s"
msgstr ""
-#: ../stoqlib/domain/payment/group.py:206
+#: ../stoqlib/domain/payment/group.py:212
#, python-format
msgid "sale %s"
msgstr "försäljning %s"
-#: ../stoqlib/domain/payment/group.py:208
+#: ../stoqlib/domain/payment/group.py:214
#, python-format
msgid "order %s"
msgstr "order %s"
-#: ../stoqlib/domain/payment/group.py:210
+#: ../stoqlib/domain/payment/group.py:216
#, python-format
msgid "renegotiation %s"
msgstr ""
@@ -5561,9 +5565,9 @@
msgstr "Fax:"
#: ../plugins/ecf/deviceconstanteditor.py:205
-#: ../data/glade/SaleDetailsDialog.glade.h:9
+#: ../data/glade/SaleDetailsDialog.glade.h:10
#: ../data/glade/RenegotiationDetailsDialog.glade.h:9
-#: ../data/glade/PurchaseDetailsDialog.glade.h:17
+#: ../data/glade/PurchaseDetailsDialog.glade.h:16
#: ../data/glade/ClientDetailsDialog.glade.h:4
#: ../data/glade/SupplierDetailsDialog.glade.h:3
msgid "Payments"
@@ -5735,8 +5739,6 @@
#: ../data/glade/SaleDiscountSlave.glade.h:2
#: ../data/glade/TributarySituationSlave.glade.h:2
#: ../data/glade/SellablePriceEditor.glade.h:2
-#: ../data/glade/PurchaseDetailsDialog.glade.h:2
-#: ../data/glade/StartPurchaseStep.glade.h:2
#: ../data/glade/PaymentMethodEditor.glade.h:2
#: ../data/glade/ProductSupplierEditor.glade.h:2
#: ../data/glade/SellableCategoryDataSlave.glade.h:2
@@ -5810,7 +5812,6 @@
#: ../data/glade/SalesPersonStep.glade.h:1
#: ../data/glade/ProductAdjustmentDialog.glade.h:1
#: ../data/glade/SellablePriceEditor.glade.h:6
-#: ../data/glade/StartPurchaseStep.glade.h:3
#: ../data/glade/PaymentMethodEditor.glade.h:4
#: ../data/glade/ProductSupplierEditor.glade.h:3
#: ../data/glade/PurchasePaymentStep.glade.h:1
@@ -5830,7 +5831,7 @@
msgstr "Eritrea"
#: ../data/glade/SalesPersonStep.glade.h:5
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:9
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:12
#, fuzzy
msgid "Notes..."
msgstr "Noteringar:"
@@ -5841,13 +5842,13 @@
msgstr "Sök"
#: ../data/glade/SalesPersonStep.glade.h:7
-#: ../data/glade/SaleDetailsDialog.glade.h:10
+#: ../data/glade/SaleDetailsDialog.glade.h:12
#: ../data/glade/PurchaseDetailsDialog.glade.h:19
msgid "Salesperson:"
msgstr "Säljare:"
#: ../data/glade/SalesPersonStep.glade.h:8
-#: ../data/glade/SaleDetailsDialog.glade.h:12
+#: ../data/glade/SaleDetailsDialog.glade.h:14
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:4
#: ../data/glade/RenegotiationDetailsDialog.glade.h:12
#: ../data/glade/PurchaseDetailsDialog.glade.h:20
@@ -5861,12 +5862,19 @@
#: ../data/glade/SaleDetailsDialog.glade.h:2
#: ../data/glade/RenegotiationDetailsDialog.glade.h:2
-#: ../data/glade/PurchaseDetailsDialog.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:3
#, fuzzy
msgid "Changes"
msgstr "Avbryt"
-#: ../data/glade/SaleDetailsDialog.glade.h:7
+#: ../data/glade/SaleDetailsDialog.glade.h:6
+#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:5
+#: ../data/glade/PurchaseDetailsDialog.glade.h:8
+#: ../data/glade/PaymentMethodEditor.glade.h:7
+msgid "Interest:"
+msgstr "Ränta:"
+
+#: ../data/glade/SaleDetailsDialog.glade.h:8
#: ../data/glade/RenegotiationDetailsDialog.glade.h:7
#: ../data/glade/FinishPurchaseStep.glade.h:3
#: ../data/glade/ReceivingOrderDetailsDialog.glade.h:1
@@ -5874,13 +5882,28 @@
msgid "Notes"
msgstr "Noteringar:"
-#: ../data/glade/SaleDetailsDialog.glade.h:13
+#: ../data/glade/SaleDetailsDialog.glade.h:11
+#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:8
+#: ../data/glade/PurchaseDetailsDialog.glade.h:17
+#, fuzzy
+msgid "Penalty:"
+msgstr "Betalningar"
+
+#: ../data/glade/SaleDetailsDialog.glade.h:15
#: ../data/glade/PaymentRenegotiationPaymentListStep.glade.h:5
#: ../data/glade/RenegotiationDetailsDialog.glade.h:13
#: ../data/glade/PurchaseDetailsDialog.glade.h:22
msgid "Surcharge:"
msgstr ""
+#: ../data/glade/SaleDetailsDialog.glade.h:16
+#: ../data/glade/PurchaseDetailsDialog.glade.h:23
+#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:3
+#: ../data/glade/SaleReturnSlave.glade.h:11
+#, fuzzy
+msgid "Total Paid:"
+msgstr "Noteringar:"
+
#: ../data/glade/QuoteSupplierStep.glade.h:1
msgid "Include all products in quotes"
msgstr ""
@@ -5932,11 +5955,6 @@
msgid "History"
msgstr "Varulagershistorik"
-#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:5
-#: ../data/glade/PaymentMethodEditor.glade.h:7
-msgid "Interest:"
-msgstr "Ränta:"
-
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:6
#: ../data/glade/InstallmentConfirmation.glade.h:7
#, fuzzy
@@ -5948,11 +5966,6 @@
msgid "Paid value:"
msgstr "Betalad summa"
-#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:8
-#, fuzzy
-msgid "Penalty:"
-msgstr "Betalningar"
-
#: ../data/glade/LonelyPaymentDetailsDialog.glade.h:10
#: ../data/glade/DeviceConstantEditor.glade.h:5
#: ../data/glade/SellableTaxConstantEditor.glade.h:2
@@ -6099,7 +6112,7 @@
msgstr "Make(a):"
#: ../data/glade/NoteSlave.glade.h:1
-#: ../data/glade/PurchaseDetailsDialog.glade.h:10
+#: ../data/glade/PurchaseDetailsDialog.glade.h:9
msgid "Notes:"
msgstr "Noteringar:"
@@ -6363,33 +6376,39 @@
msgid "Phone Number:"
msgstr "Telefonnummer:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:3
+#: ../data/glade/PurchaseDetailsDialog.glade.h:1
msgid "Additional Info"
msgstr ""
-#: ../data/glade/PurchaseDetailsDialog.glade.h:7
+#: ../data/glade/PurchaseDetailsDialog.glade.h:5
+#: ../data/glade/StartPurchaseStep.glade.h:5
+#, fuzzy
+msgid "Expected Freight:"
+msgstr "Frakt:"
+
+#: ../data/glade/PurchaseDetailsDialog.glade.h:6
#: ../data/glade/FinishPurchaseStep.glade.h:2
msgid "Expected Receival Date:"
msgstr ""
-#: ../data/glade/PurchaseDetailsDialog.glade.h:8
-#: ../data/glade/StartPurchaseStep.glade.h:8
+#: ../data/glade/PurchaseDetailsDialog.glade.h:7
+#: ../data/glade/StartPurchaseStep.glade.h:7
msgid "Freight Type:"
msgstr "Frakttyp:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:11
+#: ../data/glade/PurchaseDetailsDialog.glade.h:10
#: ../data/glade/CreditProviderMethodSlave.glade.h:3
msgid "Number of Installments:"
msgstr ""
-#: ../data/glade/PurchaseDetailsDialog.glade.h:13
+#: ../data/glade/PurchaseDetailsDialog.glade.h:12
#: ../data/glade/PaymentChangeDialog.glade.h:2
-#: ../data/glade/StartPurchaseStep.glade.h:11
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:10
+#: ../data/glade/StartPurchaseStep.glade.h:9
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:13
msgid "Order Number:"
msgstr "Ordernummer:"
-#: ../data/glade/PurchaseDetailsDialog.glade.h:14
+#: ../data/glade/PurchaseDetailsDialog.glade.h:13
msgid "Order Status:"
msgstr ""
@@ -6438,7 +6457,12 @@
msgid "Price ($CURRENCY):"
msgstr ""
-#: ../data/glade/StartPurchaseStep.glade.h:4
+#: ../data/glade/StartPurchaseStep.glade.h:1
+#, fuzzy
+msgid "$CURRENCY"
+msgstr "Lön ($CURRENCY):"
+
+#: ../data/glade/StartPurchaseStep.glade.h:2
msgid "A_dd/Edit Supplier..."
msgstr "_Lägg till/redigera leverantör..."
@@ -6461,12 +6485,6 @@
"the remaining value.</b>"
msgstr ""
-#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:3
-#: ../data/glade/SaleReturnSlave.glade.h:11
-#, fuzzy
-msgid "Total Paid:"
-msgstr "Noteringar:"
-
#: ../data/glade/PurchaseFinishPaymentAdjustStep.glade.h:5
#, fuzzy
msgid "kiwilabel1"
@@ -6671,7 +6689,7 @@
msgstr "Detaljer"
#: ../data/glade/InstallmentConfirmation.glade.h:3
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:3
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:4
#, fuzzy
msgid "Discount ($CURRENCY):"
msgstr "Rabatt:"
@@ -6799,7 +6817,7 @@
msgstr "Lösenord:"
#: ../data/glade/ProductsAdjustment.glade.h:4
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:7
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:10
#: ../data/glade/FiscalBookEntryEditor.glade.h:3
msgid "Invoice Number:"
msgstr "Fakturanummer:"
@@ -6895,31 +6913,39 @@
msgid "Financial Status:"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:4
-msgid "Freight ($CURRENCY):"
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:3
+msgid "Create a separate payment for freight"
msgstr ""
#: ../data/glade/ReceivingInvoiceSlave.glade.h:5
+msgid "Freight ($CURRENCY):"
+msgstr ""
+
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:7
msgid "ICMS Total ($CURRENCY):"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:6
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:8
msgid "IPI ($CURRENCY):"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:8
-msgid "Invoice Total ($CURRENCY):"
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:9
+msgid "Include freight value in installments"
msgstr ""
#: ../data/glade/ReceivingInvoiceSlave.glade.h:11
+msgid "Invoice Total ($CURRENCY):"
+msgstr ""
+
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:14
msgid "Others Expenditures ($CURRENCY):"
msgstr ""
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:12
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:15
msgid "Products Total ($CURRENCY):"
msgstr "Varutotal ($CURRENCY)"
-#: ../data/glade/ReceivingInvoiceSlave.glade.h:13
+#: ../data/glade/ReceivingInvoiceSlave.glade.h:16
msgid "Secure ($CURRENCY):"
msgstr ""
@@ -7369,6 +7395,17 @@
msgstr ""
#, fuzzy
+#~ msgid "Payment number"
+#~ msgstr "Betalningstyp"
+
+#, fuzzy
+#~ msgid "Additional Instructions:"
+#~ msgstr "Extra _instruktioner"
+
+#~ msgid "Total %s"
+#~ msgstr "Totalt %s"
+
+#, fuzzy
#~ msgid "Quantity Sold"
#~ msgstr "Antal"
More information about the POS-commit
mailing list