Stoq

Merge lp:~romaia/stoq/custo-medio into lp:~stoq-dev/stoq/master-old

  1. custo-medio
  2. Merge into master-old
Proposed by Ronaldo Maia
Status: Merged
Merged at revision: not available
Proposed branch: lp:~romaia/stoq/custo-medio
Merge into: lp:~stoq-dev/stoq/master-old
Diff against target: None lines
To merge this branch: bzr merge lp:~romaia/stoq/custo-medio
Reviewer Review Type Date Requested Status
George Kussumoto (community) Approve
Review via email: mp+10479@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ronaldo Maia (romaia) wrote :

Adicionando coluna com o custo médio ao aplicativo estoque.

Revision history for this message
George Kussumoto (georgeyk) :
review: Approve
lp:~romaia/stoq/custo-medio updated
1583. By Ronaldo Maia

Add sold items report

1584. By Ronaldo Maia

add stock cost dialog

1585. By Ronaldo Maia

Move:
 - Sold products report from sales to purchase (!)
 - Stock cost editor from stock to purchase
Remove:
 - stock cost column from stock app

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stoq/gui/stock/stock.py'
2--- stoq/gui/stock/stock.py 2009-07-27 18:19:18 +0000
3+++ stoq/gui/stock/stock.py 2009-08-20 19:20:42 +0000
4@@ -32,6 +32,7 @@
5 from kiwi.enums import SearchFilterPosition
6 from kiwi.ui.search import ComboSearchFilter
7 from kiwi.ui.objectlist import Column, SearchColumn
8+from kiwi.datatypes import currency
9 from stoqlib.exceptions import DatabaseInconsistency
10 from stoqlib.database.runtime import (new_transaction, get_current_branch,
11 finish_transaction)
12@@ -88,20 +89,23 @@
13 def get_columns(self):
14 return [SearchColumn('code', title=_('Code'), sorted=True,
15 sort_func=sort_sellable_code,
16- data_type=str, width=130),
17+ data_type=str, width=100),
18 SearchColumn('barcode', title=_("Barcode"), data_type=str,
19 width=100),
20 SearchColumn('category_description', title=_("Category"),
21- data_type=str, width=120, visible=False),
22+ data_type=str, width=100, visible=False),
23 SearchColumn('description', title=_("Description"),
24 data_type=str, expand=True,
25 ellipsize=pango.ELLIPSIZE_END),
26 SearchColumn('location', title=_("Location"), data_type=str,
27- width=120, visible=False),
28+ width=100, visible=False),
29 SearchColumn('stock', title=_('Quantity'),
30- data_type=decimal.Decimal, width=100),
31+ data_type=decimal.Decimal, width=80),
32 SearchColumn('unit', title=_("Unit"), data_type=str,
33- width=80)]
34+ width=40),
35+ SearchColumn('stock_cost', title=_("Avg. Stock Cost"),
36+ visible=False, data_type=currency, width=60)
37+ ]
38
39 def query(self, query, having, conn):
40 branch = self.branch_filter.get_state().value

Subscribers

People subscribed via source and target branches