[POS-commit] r6355 - in stoqlib/trunk/stoqlib: domain gui/dialogs
gui/editors gui/search lib
Johan Dahlin
jdahlin at async.com.br
Tue Apr 10 11:07:29 BRT 2007
Author: jdahlin
Date: Tue Apr 10 11:07:29 2007
New Revision: 6355
Modified:
stoqlib/trunk/stoqlib/domain/fiscal.py
stoqlib/trunk/stoqlib/domain/sale.py
stoqlib/trunk/stoqlib/gui/dialogs/clientdetails.py
stoqlib/trunk/stoqlib/gui/dialogs/productstockdetails.py
stoqlib/trunk/stoqlib/gui/editors/invoiceeditor.py
stoqlib/trunk/stoqlib/gui/editors/tilleditor.py
stoqlib/trunk/stoqlib/gui/search/fiscalsearch.py
stoqlib/trunk/stoqlib/gui/search/salesearch.py
stoqlib/trunk/stoqlib/gui/search/tillsearch.py
stoqlib/trunk/stoqlib/lib/invoice.py
Log:
#3298: Consistent datetime importing
Modified: stoqlib/trunk/stoqlib/domain/fiscal.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/fiscal.py (original)
+++ stoqlib/trunk/stoqlib/domain/fiscal.py Tue Apr 10 11:07:29 2007
@@ -28,7 +28,7 @@
Note that this whole module is Brazil-specific.
"""
-from datetime import datetime
+import datetime
from sqlobject.sqlbuilder import AND
from sqlobject import (UnicodeCol, DateTimeCol, ForeignKey, IntCol,
@@ -58,7 +58,7 @@
class AbstractFiscalBookEntry(InheritableModel):
implements(IReversal)
- date = DateTimeCol(default=datetime.now)
+ date = DateTimeCol(default=datetime.datetime.now)
is_reversal = BoolCol(default=False)
invoice_number = IntCol()
cfop = ForeignKey("CfopData")
Modified: stoqlib/trunk/stoqlib/domain/sale.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/sale.py (original)
+++ stoqlib/trunk/stoqlib/domain/sale.py Tue Apr 10 11:07:29 2007
@@ -25,8 +25,8 @@
##
""" Sale object and related objects implementation """
+import datetime
from decimal import Decimal
-from datetime import datetime
from sqlobject import UnicodeCol, DateTimeCol, ForeignKey, IntCol, SQLObject
from sqlobject.sqlbuilder import AND
@@ -117,7 +117,7 @@
coupon_id = IntCol()
service_invoice_number = IntCol(default=None)
- open_date = DateTimeCol(default=datetime.now)
+ open_date = DateTimeCol(default=datetime.datetime.now)
close_date = DateTimeCol(default=None)
confirm_date = DateTimeCol(default=None)
cancel_date = DateTimeCol(default=None)
@@ -350,7 +350,7 @@
if not group.check_close():
return False
- self.close_date = datetime.now()
+ self.close_date = datetime.datetime.now()
return True
def create_sale_return_adapter(self):
@@ -374,7 +374,7 @@
raise StoqlibError("Invalid status for cancel operation, got %s"
% Sale.get_status_name(self.status))
self.cancel_items()
- self.cancel_date = datetime.now()
+ self.cancel_date = datetime.datetime.now()
group = self.check_payment_group()
# FIXME: Don't use renegotiation_adapter.get_adapted()
@@ -406,7 +406,7 @@
group = IPaymentGroup(self)
group.confirm(gift_certificate_settings)
self.status = self.STATUS_CONFIRMED
- self.confirm_date = datetime.now()
+ self.confirm_date = datetime.datetime.now()
self.check_close()
#
Modified: stoqlib/trunk/stoqlib/gui/dialogs/clientdetails.py
==============================================================================
--- stoqlib/trunk/stoqlib/gui/dialogs/clientdetails.py (original)
+++ stoqlib/trunk/stoqlib/gui/dialogs/clientdetails.py Tue Apr 10 11:07:29 2007
@@ -26,7 +26,7 @@
##
""" Classes for client details """
-from datetime import date
+import datetime
import gtk
from kiwi.python import Settable
@@ -123,7 +123,7 @@
return [Column("id", title=_("#"),
data_type=int, justify=gtk.JUSTIFY_RIGHT,
format='%04d', width=90, sorted=True),
- Column("open_date", title=_("Date"), data_type=date,
+ Column("open_date", title=_("Date"), data_type=datetime.date,
justify=gtk.JUSTIFY_RIGHT, width=80),
Column("salesperson_name", title=_("Salesperson"),
searchable=True, expand=True, data_type=str),
@@ -150,7 +150,7 @@
title=_("Description"), data_type=str, expand=True,
searchable=True),
Column("estimated_fix_date", title=_("Estimated Fix Date"),
- width=130,data_type=date)]
+ width=130,data_type=datetime.date)]
def _get_payments_columns(self):
return [Column("id", title=_("#"),
@@ -162,7 +162,7 @@
data_type=str, searchable=True, width=190,
expand=True),
Column("due_date", title=_("Due Date"), width=110,
- data_type=date, sorted=True),
+ data_type=datetime.date, sorted=True),
Column("status_str", title=_("Status"), width=80,
data_type=str),
ColoredColumn("base_value", title=_("Value"),
Modified: stoqlib/trunk/stoqlib/gui/dialogs/productstockdetails.py
==============================================================================
--- stoqlib/trunk/stoqlib/gui/dialogs/productstockdetails.py (original)
+++ stoqlib/trunk/stoqlib/gui/dialogs/productstockdetails.py Tue Apr 10 11:07:29 2007
@@ -26,7 +26,7 @@
##
""" Classes for product stock details """
-from datetime import date
+import datetime
from decimal import Decimal
import gtk
@@ -93,7 +93,7 @@
title=_("#"), data_type=int, sorted=True,
justify=gtk.JUSTIFY_RIGHT, width=45),
Column("receiving_order.receival_date", title=_("Date"),
- data_type=date, justify=gtk.JUSTIFY_RIGHT,
+ data_type=datetime.date, justify=gtk.JUSTIFY_RIGHT,
width=80),
Column("receiving_order.id",
title=_("Purchase Order"), data_type=str,
@@ -113,7 +113,7 @@
data_type=int, justify=gtk.JUSTIFY_RIGHT,
width=45, sorted=True),
Column("sale.open_date",
- title=_("Date Started"), data_type=date,
+ title=_("Date Started"), data_type=datetime.date,
justify=gtk.JUSTIFY_RIGHT, width=130),
Column("sale.client_name",
title=_("Client"), expand=True, data_type=str),
Modified: stoqlib/trunk/stoqlib/gui/editors/invoiceeditor.py
==============================================================================
--- stoqlib/trunk/stoqlib/gui/editors/invoiceeditor.py (original)
+++ stoqlib/trunk/stoqlib/gui/editors/invoiceeditor.py Tue Apr 10 11:07:29 2007
@@ -25,7 +25,7 @@
""" Invoice details editor implementation. This is a Brazil-specific
editor. """
-from datetime import datetime
+import datetime
from kiwi.python import Settable
@@ -39,7 +39,7 @@
model_type = Settable
def create_model(self, conn):
- dt = datetime.now()
+ dt = datetime.datetime.now()
return Settable(date=dt.date(), time=dt.time())
def get_title(self, dummy):
@@ -52,4 +52,4 @@
self.add_proxy(self.model, self.get_proxy_widgets())
def on_confirm(self):
- return datetime.combine(self.model.date, self.model.time)
+ return datetime.datetime.combine(self.model.date, self.model.time)
Modified: stoqlib/trunk/stoqlib/gui/editors/tilleditor.py
==============================================================================
--- stoqlib/trunk/stoqlib/gui/editors/tilleditor.py (original)
+++ stoqlib/trunk/stoqlib/gui/editors/tilleditor.py Tue Apr 10 11:07:29 2007
@@ -25,7 +25,7 @@
##
""" Editors implementation for open/close operation on till operation"""
-from datetime import datetime
+import datetime
from decimal import Decimal
from kiwi.datatypes import ValidationError, currency
@@ -219,7 +219,7 @@
def setup_proxies(self):
self.proxy = self.add_proxy(self.model, BaseCashSlave.proxy_widgets)
- self.date.set_text(str(datetime.today().date()))
+ self.date.set_text(str(datetime.date.today()))
self.proxy.update('value', Decimal('0.01'))
#
Modified: stoqlib/trunk/stoqlib/gui/search/fiscalsearch.py
==============================================================================
--- stoqlib/trunk/stoqlib/gui/search/fiscalsearch.py (original)
+++ stoqlib/trunk/stoqlib/gui/search/fiscalsearch.py Tue Apr 10 11:07:29 2007
@@ -24,7 +24,7 @@
##
""" Search dialogs for fiscal objects """
-from datetime import date
+import datetime
import gtk
from kiwi.ui.widgets.list import Column
@@ -109,7 +109,7 @@
return [Column('id', title=_('#'), width=80,
data_type=int, sorted=True),
Column('date', title=_('Date'), width=80,
- data_type=date, justify=gtk.JUSTIFY_RIGHT),
+ data_type=datetime.date, justify=gtk.JUSTIFY_RIGHT),
Column('invoice_number', title=_('Invoice'),
data_type=int, width=110),
Column('cfop_code', title=_('CFOP'), data_type=str, width=90),
Modified: stoqlib/trunk/stoqlib/gui/search/salesearch.py
==============================================================================
--- stoqlib/trunk/stoqlib/gui/search/salesearch.py (original)
+++ stoqlib/trunk/stoqlib/gui/search/salesearch.py Tue Apr 10 11:07:29 2007
@@ -25,8 +25,8 @@
""" Search dialogs for sale objects """
+import datetime
from decimal import Decimal
-from datetime import date
import gtk
from kiwi.datatypes import currency
@@ -73,7 +73,7 @@
return [Column('id', title=_('Number'), width=70,
data_type=int, sorted=True),
Column('open_date', title=_('Date Started'), width=120,
- data_type=date, justify=gtk.JUSTIFY_RIGHT),
+ data_type=datetime.date, justify=gtk.JUSTIFY_RIGHT),
Column('client_name', title=_('Client'),
data_type=str, width=140),
Column('salesperson_name', title=_('Salesperson'),
Modified: stoqlib/trunk/stoqlib/gui/search/tillsearch.py
==============================================================================
--- stoqlib/trunk/stoqlib/gui/search/tillsearch.py (original)
+++ stoqlib/trunk/stoqlib/gui/search/tillsearch.py Tue Apr 10 11:07:29 2007
@@ -24,7 +24,7 @@
##
""" Search dialogs for fiscal objects """
-from datetime import date
+import datetime
import gtk
from kiwi.ui.widgets.list import Column, ColoredColumn
@@ -63,7 +63,7 @@
justify=gtk.JUSTIFY_RIGHT, format="%05d",
data_type=int, sorted=True),
Column('date', title=_('Date'), width=80,
- data_type=date, justify=gtk.JUSTIFY_RIGHT),
+ data_type=datetime.date, justify=gtk.JUSTIFY_RIGHT),
Column('description', title=_('Description'),
data_type=str, expand=True),
Column('station_name', title=_('Station'), data_type=str,
Modified: stoqlib/trunk/stoqlib/lib/invoice.py
==============================================================================
--- stoqlib/trunk/stoqlib/lib/invoice.py (original)
+++ stoqlib/trunk/stoqlib/lib/invoice.py Tue Apr 10 11:07:29 2007
@@ -25,7 +25,7 @@
##
""" Sales invoice implementation. All this module is brazil-specific """
-from datetime import datetime, date, time
+import datetime
from decimal import Decimal
from kiwi.argcheck import argcheck, number
@@ -192,8 +192,8 @@
# default filename for the invoice
default_filename = _(u"invoice") + ".txt"
- @argcheck(basestring, Sale, datetime, InvoiceType)
- def __init__(self, filename, sale, date=datetime.now(),
+ @argcheck(basestring, Sale, datetime.datetime, InvoiceType)
+ def __init__(self, filename, sale, date=datetime.datetime.now(),
invoice_type=INVOICE_TYPE_OUT):
"""
@param filename: The filename where the invoice will be saved in.
@@ -257,9 +257,9 @@
def _insert_data_on_coordinate(self, data, coord_name, max_len=None,
increment=None):
- if isinstance(data, date):
+ if isinstance(data, datetime.date):
data = data.strftime("%d/%m/%y")
- elif isinstance(data, time):
+ elif isinstance(data, datetime.time):
data = data.strftime("%X")
elif isinstance(data, unicode):
data = data.encode("cp850")
More information about the POS-commit
mailing list