openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01699
[Merge] lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
#695038 OpenOfficeReportDesigner Group to Remove in Trunk
https://bugs.launchpad.net/bugs/695038
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/44834
Hello
With this Merge Proposal:
+ Fixes for buidbot warning
Kindly review it.
thank You
--
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/44834
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons.
=== modified file 'account/wizard/account_report_account_balance.py'
--- account/wizard/account_report_account_balance.py 2010-12-27 12:45:30 +0000
+++ account/wizard/account_report_account_balance.py 2010-12-29 11:34:01 +0000
@@ -19,8 +19,6 @@
#
##############################################################################
-from lxml import etree
-
from osv import osv
class account_balance_report(osv.osv_memory):
@@ -38,4 +36,4 @@
account_balance_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_report_aged_partner_balance.py'
--- account/wizard/account_report_aged_partner_balance.py 2010-12-27 12:45:30 +0000
+++ account/wizard/account_report_aged_partner_balance.py 2010-12-29 11:34:01 +0000
@@ -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 _
=== modified file 'account/wizard/account_report_balance_sheet.py'
--- account/wizard/account_report_balance_sheet.py 2010-12-27 10:50:43 +0000
+++ account/wizard/account_report_balance_sheet.py 2010-12-29 11:34:01 +0000
@@ -19,8 +19,6 @@
#
##############################################################################
-from lxml import etree
-
from osv import osv, fields
from tools.translate import _
@@ -86,4 +84,4 @@
account_bs_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_report_profit_loss.py'
--- account/wizard/account_report_profit_loss.py 2010-12-27 12:45:30 +0000
+++ account/wizard/account_report_profit_loss.py 2010-12-29 11:34:01 +0000
@@ -19,8 +19,6 @@
#
##############################################################################
-from lxml import etree
-
from osv import osv, fields
class account_pl_report(osv.osv_memory):
@@ -60,4 +58,4 @@
account_pl_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account_anglo_saxon/invoice.py'
--- account_anglo_saxon/invoice.py 2010-12-21 12:32:02 +0000
+++ account_anglo_saxon/invoice.py 2010-12-29 11:34:01 +0000
@@ -21,7 +21,7 @@
#
##############################################################################
-from osv import fields, osv
+from osv import osv
class account_invoice_line(osv.osv):
_inherit = "account.invoice.line"
=== modified file 'account_voucher/report/account_voucher_sales_receipt.py'
--- account_voucher/report/account_voucher_sales_receipt.py 2010-12-24 12:02:21 +0000
+++ account_voucher/report/account_voucher_sales_receipt.py 2010-12-29 11:34:01 +0000
@@ -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):
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py 2010-12-22 12:55:49 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py 2010-12-29 11:34:01 +0000
@@ -52,7 +52,6 @@
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)
=== modified file 'mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py'
--- mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py 2010-12-21 10:04:23 +0000
+++ mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py 2010-12-29 11:34:01 +0000
@@ -25,7 +25,6 @@
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'):
=== modified file 'product/pricelist.py'
--- product/pricelist.py 2010-12-28 17:07:18 +0000
+++ product/pricelist.py 2010-12-29 11:34:01 +0000
@@ -23,8 +23,6 @@
from _common import rounding
import time
-from tools import config
-from tools.misc import ustr
from tools.translate import _
import decimal_precision as dp
=== modified file 'sale_layout/report/report_sale_layout.py'
--- sale_layout/report/report_sale_layout.py 2010-12-20 14:56:07 +0000
+++ sale_layout/report/report_sale_layout.py 2010-12-29 11:34:01 +0000
@@ -41,7 +41,6 @@
def sale_order_lines(self, sale_order):
result = []
sub_total = {}
- info = []
order_lines = []
res = {}
obj_order_line = self.pool.get('sale.order.line')
=== modified file 'wiki/wizard/wiki_wiki_page_open.py'
--- wiki/wizard/wiki_wiki_page_open.py 2010-12-28 17:07:18 +0000
+++ wiki/wizard/wiki_wiki_page_open.py 2010-12-29 11:34:01 +0000
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from osv import osv
class wiki_wiki_page_open(osv.osv_memory):
""" wizard Open Page """
Follow ups