diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/branch/branch.conf stoqlib-0.9.12+3192~lucid1/.bzr/branch/branch.conf --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/branch/branch.conf 2010-07-20 21:23:30.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/branch/branch.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -stacked_on_location = file:///home/romaia/stoq/stoq.launchpad.master/stoqlib/ -parent_location = ../../stoq.launchpad.master/stoqlib/ diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/branch/format stoqlib-0.9.12+3192~lucid1/.bzr/branch/format --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/branch/format 2010-07-20 21:23:30.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/branch/format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Bazaar Branch Format 7 (needs bzr 1.6) diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/branch/last-revision stoqlib-0.9.12+3192~lucid1/.bzr/branch/last-revision --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/branch/last-revision 2010-07-21 20:57:02.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/branch/last-revision 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3190 romaia@async.com.br-20100721195255-c1ikfczy536po42v diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/branch-format stoqlib-0.9.12+3192~lucid1/.bzr/branch-format --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/branch-format 2010-07-20 21:23:29.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/branch-format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Bazaar-NG meta directory, format 1 diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/checkout/conflicts stoqlib-0.9.12+3192~lucid1/.bzr/checkout/conflicts --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/checkout/conflicts 2010-07-21 20:57:22.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/checkout/conflicts 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -BZR conflict list format 1 Binary files /tmp/9QqKUR6Mef/stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/checkout/dirstate and /tmp/zupLSm8qBG/stoqlib-0.9.12+3192~lucid1/.bzr/checkout/dirstate differ diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/checkout/format stoqlib-0.9.12+3192~lucid1/.bzr/checkout/format --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/checkout/format 2010-07-20 21:23:30.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/checkout/format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Bazaar Working Tree Format 6 (bzr 1.14) diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/checkout/merge-hashes stoqlib-0.9.12+3192~lucid1/.bzr/checkout/merge-hashes --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/checkout/merge-hashes 2010-07-21 20:57:22.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/checkout/merge-hashes 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -BZR merge-modified list format 1 -file_id: stoqlibdomainperson.-20080411064237-zwkylqt2w20xlykd-460 -hash: 3e4d4158477ab0bac55b6fd8d7104f5762351653 diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/README stoqlib-0.9.12+3192~lucid1/.bzr/README --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/README 2010-07-20 21:23:29.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -This is a Bazaar control directory. -Do not change any files in this directory. -See http://bazaar-vcs.org/ for more information about Bazaar. diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/repository/format stoqlib-0.9.12+3192~lucid1/.bzr/repository/format --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/repository/format 2010-07-20 21:23:29.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/repository/format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Bazaar RepositoryFormatKnitPack5 (bzr 1.6) diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/repository/pack-names stoqlib-0.9.12+3192~lucid1/.bzr/repository/pack-names --- stoqlib-0.9.12+r3190~ppa1~lucid1/.bzr/repository/pack-names 2010-07-20 21:23:29.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/.bzr/repository/pack-names 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -Bazaar Graph Index 1 -node_ref_lists=0 -key_elements=1 -len=0 - diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/debian/bzr-builder.manifest stoqlib-0.9.12+3192~lucid1/debian/bzr-builder.manifest --- stoqlib-0.9.12+r3190~ppa1~lucid1/debian/bzr-builder.manifest 1970-01-01 01:00:00.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/debian/bzr-builder.manifest 2010-08-16 14:49:19.000000000 +0100 @@ -0,0 +1,2 @@ +# bzr-builder format 0.2 deb-version {debupstream}+3192 +lp:stoqlib revid:gergagabriel@gmail.com-20100727182538-w63pzgurdngrb2xt diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/debian/changelog stoqlib-0.9.12+3192~lucid1/debian/changelog --- stoqlib-0.9.12+r3190~ppa1~lucid1/debian/changelog 2010-07-21 20:57:23.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/debian/changelog 2010-08-16 14:49:19.000000000 +0100 @@ -1,307 +1,558 @@ -stoqlib (0.9.12+r3190~ppa1~lucid1) lucid; urgency=low +stoqlib (0.9.12+3192~lucid1) karmic; urgency=low - * testing ppa, dist lucid, try 1, bzr revision 3190 + * Auto build. - -- Ronaldo Maia Wed, 21 Jul 2010 16:57:23 -0300 + -- Ronaldo Maia Mon, 16 Aug 2010 13:49:19 +0000 stoqlib (0.9.12) karmic; urgency=low + * New Release + + -- George Y. Kussumoto Tue, 23 Mar 2010 17:26:30 -0300 + + stoqlib (0.9.11.2) karmic; urgency=low + * Bugfix Release + + -- Wed, 16 Dec 2009 15:01:10 -0200 + + stoqlib (0.9.11) karmic; urgency=low + * New Release + + -- George Y. Kussumoto Tue, 15 Dec 2009 12:11:57 -0200 + + stoqlib (0.9.10) karmic; urgency=low + * New Release + + -- George Y. Kussumoto Tue, 14 Jul 2009 15:20:37 -0300 + + stoqlib (0.9.9.4) jaunty; urgency=low + * Bugfix Release + + -- George Y. Kussumoto Thu, 30 Apr 2009 17:18:06 -0300 + + stoqlib (0.9.9.2) jaunty; urgency=low + * Bugfix Release + + -- George Y. Kussumoto Thu, 16 Apr 2009 17:50:27 -0300 + + stoqlib (0.9.9) jaunty; urgency=low + * New Release + + -- George Y. Kussumoto Wed, 15 Apr 2009 16:04:28 -0300 + + stoqlib (0.9.8.4) jaunty; urgency=low + * Bugfix Release + + -- George Y. Kussumoto Mon, 09 Feb 2009 15:12:09 -0200 + + stoqlib (0.9.8.2) jaunty; urgency=low + * Bugfix Release + + -- George Y. Kussumoto Wed, 28 Jan 2009 13:50:39 -0200 + + stoqlib (0.9.8) jaunty; urgency=low + * New Release + + -- George Y. Kussumoto Tue, 27 Jan 2009 15:35:08 -0200 + + stoqlib (0.9.7.2) intrepid; urgency=low + * Bugfix Release + + -- George Y. Kussumoto Fri, 12 Sep 2008 15:10:28 -0300 + + stoqlib (0.9.7) intrepid; urgency=low + * New Release + + -- George Y. Kussumoto Wed, 10 Sep 2008 15:48:31 -0300 + + stoqlib (0.9.6.2) intrepid; urgency=low + * Bugfix Release + + -- George Y. Kussumoto Mon, 14 Jul 2008 13:41:07 -0300 + + stoqlib (0.9.6) intrepid; urgency=low + * New Release + + -- George Y. Kussumoto Thu, 29 May 2008 19:00:33 -0300 + + stoqlib (0.9.5) gutsy; urgency=low + * Non Maintainer Upload + * New Release + + -- George Y. Kussumoto (georgeyk) Tue, 18 Mar 2008 14:37:13 -0300 + + stoqlib (0.9.4-4) feisty; urgency=low + * Fix + + -- Fabio Morbec Thu, 11 Feb 2008 16:32:35 -0300 + + stoqlib (0.9.4-3) feisty; urgency=low + * Fix + + -- Fabio Morbec Thu, 31 Jan 2008 18:56:35 -0300 + + stoqlib (0.9.4-2) feisty; urgency=low + * Fix + + -- Fabio Morbec Thu, 31 Jan 2008 18:20:35 -0300 + + stoqlib (0.9.4-1) feisty; urgency=low + * New release + + -- Fabio Morbec Thu, 31 Jan 2008 17:20:35 -0300 + + stoqlib (0.9.3-3) feisty; urgency=low + *FIX + + -- Fabio Morbec Thu, 08 Nov 2007 16:20:35 -0300 + + stoqlib (0.9.3-2) feisty; urgency=low + *FIX stoqdrivers dependency. + + -- Fabio Morbec Thu, 08 Nov 2007 12:53:35 -0300 + + stoqlib (0.9.3-1) feisty; urgency=low + *FIX + + -- Fabio Morbec Thu, 30 Aug 2007 22:27:35 -0300 + + stoqlib (0.9.2-8) feisty; urgency=low + *FIX + + -- Fabio Morbec Thu, 30 Aug 2007 22:27:35 -0300 + + stoqlib (0.9.2-7) feisty; urgency=low + * Fix + + -- Fabio Morbec Thu, 30 Aug 2007 22:12:35 -0300 + + stoqlib (0.9.2-6) feisty; urgency=low + * + + -- Fabio Morbec Thu, 30 Aug 2007 21:17:35 -0300 + + stoqlib (0.9.2-5) feisty; urgency=low + * Fix + + -- Fabio Morbec Thu, 30 Aug 2007 20:40:58 -0300 + + stoqlib (0.9.2-4) feisty; urgency=low + * Another Fix + + -- Fabio Morbec Thu, 30 Aug 2007 20:33:17 -0300 + + stoqlib (0.9.2-3) feisty; urgency=low + * Fix plugin again + + -- Fabio Morbec Thu, 30 Aug 2007 20:18:08 -0300 + + stoqlib (0.9.2-2) feisty; urgency=low + * Fix plugin + + -- Fabio Morbec Thu, 30 Aug 2007 06:20:34 -0300 + + stoqlib (0.9.2-1) feisty; urgency=low + * New release + + -- Fabio Morbec Thu, 30 Aug 2007 06:20:34 -0300 + + stoqlib (0.9.1-4) feisty; urgency=low + * Fix database patch + + -- Johan Dahlin Mon, 16 Jul 2007 20:05:34 -0300 + + stoqlib (0.9.1-3) feisty; urgency=low + * New release + + -- Johan Dahlin Mon, 16 Jul 2007 19:48:28 -0300 + + stoqlib (0.9.1-2) feisty; urgency=low + * Move plugins to resources instead of global_resources + + -- Johan Dahlin Mon, 16 Jul 2007 19:48:10 -0300 + + stoqlib (0.9.1-1) feisty; urgency=low + * New release + + -- Johan Dahlin Mon, 16 Jul 2007 18:28:48 -0300 + + stoqlib (0.9.0-7) dapper; urgency=low + * New release + + -- Johan Dahlin Wed, 23 May 2007 15:27:33 -0300 + + stoqlib (0.9.0-6) dapper; urgency=low + * Fix translation for reports, update translations and bump + kiwi required version + + -- Johan Dahlin Wed, 23 May 2007 13:31:29 -0300 + + stoqlib (0.9.0-5) dapper; urgency=low + * Update stoqdrivers dependency + + -- Johan Dahlin Tue, 22 May 2007 18:39:07 -0300 + + stoqlib (0.9.0-4) dapper; urgency=low + * Remove debian/preinst and bump stoqdrivers+kiwi versions + + -- Johan Dahlin Tue, 22 May 2007 17:01:18 -0300 + + stoqlib (0.9.0-3) dapper; urgency=low + * Remove absolute pixmap paths + + -- Johan Dahlin Tue, 22 May 2007 16:41:17 -0300 + + stoqlib (0.9.0-2) dapper; urgency=low + * Get the externals directory from the prefix + + -- Johan Dahlin Tue, 22 May 2007 16:27:57 -0300 + + stoqlib (0.9.0-1) dapper; urgency=low + * New release + + -- Johan Dahlin Tue, 22 May 2007 14:48:47 -0300 + + stoqlib (0.8.10-1) dapper; urgency=low + * New release + + -- Johan Dahlin Mon, 26 Mar 2007 11:24:18 -0300 + + stoqlib (0.8.9-2) dapper; urgency=low + * Include DBSettings fix so stoqdbadmin works + + -- Johan Dahlin Tue, 30 Jan 2007 18:01:55 -0200 + + stoqlib (0.8.9-1) dapper; urgency=low + * New release. Bump Kiwi requirement to 1.9.12 and stoqdrivers to 0.5.0 + + -- Johan Dahlin Tue, 30 Jan 2007 17:30:30 -0200 + + stoqlib (0.8.2-3) dapper; urgency=low + * Update swedish translation so the comboentry works + + -- Johan Dahlin Wed, 11 Oct 2006 18:54:41 -0300 + + stoqlib (0.8.2-2) dapper; urgency=low + * New package with salesperson fix + + -- Johan Dahlin Wed, 11 Oct 2006 19:33:00 +0000 + + stoqlib (0.8.2-1) dapper; urgency=low + * New release + + -- Johan Dahlin Wed, 11 Oct 2006 18:43:13 +0000 + + stoqlib (0.8.1-3) dapper; urgency=low + * Include library.get_root() fix, depend on 1:0.4.0 of stoqdrivers + + -- Johan Dahlin Mon, 9 Oct 2006 17:01:20 -0300 + + stoqlib (0.8.1-2) dapper; urgency=low + * Depend on python-psycopg2, not python-psycopg + + -- Johan Dahlin Mon, 9 Oct 2006 18:58:19 +0000 + + stoqlib (0.8.1-1) dapper; urgency=low + * Initial release. + + -- Johan Dahlin Fri, 25 Aug 2006 17:01:47 -0300 + diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/stoqlib/gui/wizards/receivingwizard.py stoqlib-0.9.12+3192~lucid1/stoqlib/gui/wizards/receivingwizard.py --- stoqlib-0.9.12+r3190~ppa1~lucid1/stoqlib/gui/wizards/receivingwizard.py 2010-07-20 21:23:32.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/stoqlib/gui/wizards/receivingwizard.py 2010-08-16 14:49:19.000000000 +0100 @@ -241,11 +241,13 @@ return [ Column('sellable.description', title=_('Description'), data_type=str, expand=True, searchable=True), + Column('sellable.category_description', title=_('Category'), + data_type=str, width=120), Column('remaining_quantity', title=_('Quantity'), data_type=int, width=90, format_func=format_quantity, expand=True), Column('quantity', title=_('Quantity to receive'), data_type=int, width=110, format_func=format_quantity), - Column('sellable.unit_description', title=_('Unit'), data_type=str, + Column('unit_description', title=_('Unit'), data_type=str, width=50), Column('cost', title=_('Cost'), data_type=currency, format_func=get_formatted_cost, width=90), diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/stoqlib/reporting/purchase.py stoqlib-0.9.12+3192~lucid1/stoqlib/reporting/purchase.py --- stoqlib-0.9.12+r3190~ppa1~lucid1/stoqlib/reporting/purchase.py 2010-07-20 21:23:32.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/stoqlib/reporting/purchase.py 2010-08-16 14:49:19.000000000 +0100 @@ -104,7 +104,7 @@ virtual=False, width=50, align=LEFT), OTC(_("Cost"), lambda obj: get_formatted_cost(obj.cost), width=70, align=RIGHT), - OTC(_("Quantity"), lambda obj: format_quantity(obj.quantity), + OTC(_("Qty"), lambda obj: format_quantity(obj.quantity), width=70, align=RIGHT), OTC(_("Total"), lambda obj: get_formatted_price(obj.get_total()), width=90, diff -Nru stoqlib-0.9.12+r3190~ppa1~lucid1/upload.sh stoqlib-0.9.12+3192~lucid1/upload.sh --- stoqlib-0.9.12+r3190~ppa1~lucid1/upload.sh 2010-07-21 18:56:08.000000000 +0100 +++ stoqlib-0.9.12+3192~lucid1/upload.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#!/bin/sh -x - -bzr revert debian/changelog -cp debian/changelog debian/changelog.orig - -ppa="ppa" # "testing" or "ppa" (for stable) -try="1" -PACKAGE=stoqlib -REV=`bzr revno` -VERSION=`head debian/changelog -n 1 | cut -d' ' -f 2 | sed s/[\(\)]//g` -SIGNKEY=990F90AE - -#echo ${PACKAGE}_${VERSION}+r${REV}~${ppa}${try}~${dist}${try} -for dist in karmic lucid; do - cp debian/changelog.orig debian/changelog - (cd debian && debchange --force-bad-version --preserve --newversion \ - "${VERSION}+r${REV}~${ppa}${try}~${dist}${try}" \ - testing ppa, dist ${dist}, try ${try}, bzr revision ${REV}) - - debuild -S -k${SIGNKEY} - dput my-ppa-${dist} ../${PACKAGE}_${VERSION}+r${REV}~${ppa}${try}~${dist}${try}_source.changes -done