[MERGE] lp:~openerp-dev/openobject-addons/jam-dev-addons

bzr revid: sbh@tinyerp.com-20101229121135-1qz4b67bcszcegzt
This commit is contained in:
Sbh (OpenERP)
2010-12-29 17:41:35 +05:30
11 changed files with 5 additions and 21 deletions
@@ -19,8 +19,6 @@
#
##############################################################################
from lxml import etree
from osv import osv
class account_balance_report(osv.osv_memory):
@@ -38,4 +36,4 @@ class account_balance_report(osv.osv_memory):
account_balance_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -22,8 +22,6 @@
import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
from lxml import etree
from osv import osv, fields
from tools.translate import _
@@ -19,8 +19,6 @@
#
##############################################################################
from lxml import etree
from osv import osv, fields
from tools.translate import _
@@ -86,4 +84,4 @@ class account_bs_report(osv.osv_memory):
account_bs_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -19,8 +19,6 @@
#
##############################################################################
from lxml import etree
from osv import osv, fields
class account_pl_report(osv.osv_memory):
@@ -60,4 +58,4 @@ class account_pl_report(osv.osv_memory):
account_pl_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+1 -1
View File
@@ -21,7 +21,7 @@
#
##############################################################################
from osv import fields, osv
from osv import osv
class account_invoice_line(osv.osv):
_inherit = "account.invoice.line"
@@ -17,11 +17,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from osv import fields, osv
import pooler
from tools import config
import tools
class sale_receipt_report(osv.osv):
@@ -52,7 +52,6 @@ class account_analytic_account(osv.osv):
account_to_invoice_map.setdefault(rec['account_id'], []).append(rec['invoice_id'])
for account in self.browse(cr, uid, ids, context=context):
invoiced = {}
invoice_ids = filter(None, list(set(account_to_invoice_map.get(account.id, []))))
for invoice in obj_invoice.browse(cr, uid, invoice_ids, context=context):
res.setdefault(account.id, 0.0)
@@ -25,7 +25,6 @@ import logging
import optparse
import sys
import xmlrpclib
import email
class rpc_proxy(object):
def __init__(self, uid, passwd, host='localhost', port=8069, path='object', dbname='openerp'):
-2
View File
@@ -23,8 +23,6 @@ from osv import fields, osv
from _common import rounding
import time
from tools import config
from tools.misc import ustr
from tools.translate import _
import decimal_precision as dp
@@ -41,7 +41,6 @@ class sale_order_1(report_sxw.rml_parse):
def sale_order_lines(self, sale_order):
result = []
sub_total = {}
info = []
order_lines = []
res = {}
obj_order_line = self.pool.get('sale.order.line')
+1 -1
View File
@@ -19,7 +19,7 @@
#
##############################################################################
from osv import fields, osv
from osv import osv
class wiki_wiki_page_open(osv.osv_memory):
""" wizard Open Page """