Skip to content

Commit

Permalink
synchronise with current head
Browse files Browse the repository at this point in the history
  • Loading branch information
gurneyalex committed Apr 15, 2015
2 parents 7054ed5 + 1bc6f52 commit 519c5b3
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 14 deletions.
24 changes: 24 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
sudo: required
language: python

python:
- "2.7"

env:
- VERSION="8.0" LINT_CHECK="1"
- VERSION="7.0" ODOO_REPO="odoo/odoo" LINT_CHECK="0"
- VERSION="7.0" ODOO_REPO="OCA/OCB" LINT_CHECK="0"

virtualenv:
system_site_packages: true

install:
- git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
- export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
- travis_install_nightly

script:
- travis_run_tests

after_success:
coveralls
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[![Build Status](https://travis-ci.org/OCA/webkit-tools.svg?branch=master)](https://travis-ci.org/OCA/webkit-tools)
[![Coverage Status](https://img.shields.io/coveralls/OCA/webkit-tools.svg)](https://coveralls.io/r/OCA/webkit-tools?branch=master)

[![Build Status](https://travis-ci.org/OCA/webkit-tools.svg?branch=8.0)](https://travis-ci.org/OCA/webkit-tools)
[![Coverage Status](https://img.shields.io/coveralls/OCA/webkit-tools.svg?branch=8.0)](https://coveralls.io/r/OCA/webkit-tools?branch=8.0)

Webkit Tools
============

This project aim to deal with modules related to manage tools and utilities for webkit report engine on Odoo.

Here you will find:

* Base headers for reports
Expand Down
3 changes: 1 addition & 2 deletions __unported__/report_webkit_chapter_server/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
${chapter.get_structure(a)}<br/>
%endfor
""",
'author': 'Camptocamp',
'author': "Camptocamp,Odoo Community Association (OCA)",
'website': 'http://openerp.camptocamp.com',
'depends': ['report_webkit'],
'init_xml': [],
Expand All @@ -25,4 +25,3 @@
'installable': False,
'active': False,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,23 @@
from report_webkit import report_helper

chapter_logger = logging.getLogger('chapter server')


class chapter_server(object):
@classmethod
def __init__(self):
self.stack = [0]

@classmethod
def get_structure(self, level):
while len (self.stack) < level:
while len(self.stack) < level:
self.stack.append(0)
while len (self.stack) > level:
while len(self.stack) > level:
self.stack = self.stack[:level]
try:
self.stack[len (self.stack)-1] += 1
self.stack[len(self.stack)-1] += 1
except:
chapter_logger.error(self.stack)
return ".".join("%s" % s for s in self.stack) + "."
report_helper.WebKitHelper.chapter = chapter_server

report_helper.WebKitHelper.chapter = chapter_server
1 change: 0 additions & 1 deletion base_headers_webkit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################

2 changes: 1 addition & 1 deletion base_headers_webkit/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
- sale_order_wekbit,
- purchase_order_webkit, ...
""",
'author': 'Camptocamp',
'author': "Camptocamp,Odoo Community Association (OCA)",
'website': 'http://www.camptocamp.com',
'depends': ['base', 'report_webkit'],
'data': ['base_headers_data.xml'],
Expand Down

0 comments on commit 519c5b3

Please sign in to comment.