<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Odoo/addons/project_timesheet, branch 14.0</title>
<subtitle>The current checkout of upstream Odoo</subtitle>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/'/>
<entry>
<title>[MERGE] forward port of branch 9.0 up to 3e15b86</title>
<updated>2016-06-28T12:10:35+00:00</updated>
<author>
<name>Christophe Simonis</name>
<email>chs@odoo.com</email>
</author>
<published>2016-06-28T12:10:35+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=841aa4e208164c3c360723e15d480a65195ad969'/>
<id>841aa4e208164c3c360723e15d480a65195ad969</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[I18N] Update translation terms from Transifex</title>
<updated>2016-06-22T19:14:56+00:00</updated>
<author>
<name>Odoo Translation Bot</name>
<email>c3p@odoo.com</email>
</author>
<published>2016-06-22T19:14:56+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=d14efd562b4c6d8868662b104d9dcdce90456737'/>
<id>d14efd562b4c6d8868662b104d9dcdce90456737</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[MERGE] forward port of branch saas-9 up to 1d81bb0</title>
<updated>2016-06-15T10:40:59+00:00</updated>
<author>
<name>Christophe Simonis</name>
<email>chs@odoo.com</email>
</author>
<published>2016-06-15T10:40:59+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=baf494c67ba7ecba331b24bcfa5eed9bde8a16da'/>
<id>baf494c67ba7ecba331b24bcfa5eed9bde8a16da</id>
<content type='text'>
# Conflicts:
#	addons/account_extra_reports/i18n/ca.po
#	addons/account_extra_reports/i18n/fi.po
#	addons/account_extra_reports/i18n/pl.po
#	addons/account_extra_reports/i18n/te.po
#	addons/account_extra_reports/i18n/zh_CN.po
#	addons/account_full_reconcile/i18n/hu.po
#	addons/account_full_reconcile/i18n/pl.po
#	addons/crm/crm_lead_menu.xml
#	addons/crm_claim/i18n/es_PE.po
#	addons/crm_claim/i18n/hu.po
#	addons/crm_claim/i18n/ja.po
#	addons/crm_claim/i18n/pl.po
#	addons/delivery/views/delivery_view.xml
#	addons/product/product_view.xml
#	addons/project_timesheet/i18n/es_PE.po
#	addons/stock/stock_view.xml
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	addons/account_extra_reports/i18n/ca.po
#	addons/account_extra_reports/i18n/fi.po
#	addons/account_extra_reports/i18n/pl.po
#	addons/account_extra_reports/i18n/te.po
#	addons/account_extra_reports/i18n/zh_CN.po
#	addons/account_full_reconcile/i18n/hu.po
#	addons/account_full_reconcile/i18n/pl.po
#	addons/crm/crm_lead_menu.xml
#	addons/crm_claim/i18n/es_PE.po
#	addons/crm_claim/i18n/hu.po
#	addons/crm_claim/i18n/ja.po
#	addons/crm_claim/i18n/pl.po
#	addons/delivery/views/delivery_view.xml
#	addons/product/product_view.xml
#	addons/project_timesheet/i18n/es_PE.po
#	addons/stock/stock_view.xml
</pre>
</div>
</content>
</entry>
<entry>
<title>[MERGE] forward port of branch 9.0 up to bfbe2d6</title>
<updated>2016-06-14T17:27:16+00:00</updated>
<author>
<name>Christophe Simonis</name>
<email>chs@odoo.com</email>
</author>
<published>2016-06-14T17:27:16+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=f9072c789d85e8c97e68325c02b46686f52d5bc3'/>
<id>f9072c789d85e8c97e68325c02b46686f52d5bc3</id>
<content type='text'>
# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po
</pre>
</div>
</content>
</entry>
<entry>
<title>[I18N] Update translation terms from Transifex</title>
<updated>2016-06-11T22:39:18+00:00</updated>
<author>
<name>Odoo Translation Bot</name>
<email>c3p@odoo.com</email>
</author>
<published>2016-06-11T22:39:18+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=596398a7599082b5ea54ee8e0c45c8d51bcb5afb'/>
<id>596398a7599082b5ea54ee8e0c45c8d51bcb5afb</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[FIX] project_timesheet: _get_subtask_count</title>
<updated>2016-06-09T12:26:41+00:00</updated>
<author>
<name>Goffin Simon</name>
<email>sig@odoo.com</email>
</author>
<published>2016-06-09T12:26:41+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=89f424dd2819966581894ade2ff6d71d4906ba7e'/>
<id>89f424dd2819966581894ade2ff6d71d4906ba7e</id>
<content type='text'>
The task itself doesn't have to be counted, but substrcting one to
the total count was wrong when the task itself was archived.

opw:680207
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The task itself doesn't have to be counted, but substrcting one to
the total count was wrong when the task itself was archived.

opw:680207
</pre>
</div>
</content>
</entry>
<entry>
<title>[MERGE] forward port of branch 9.0 up to fa4a371</title>
<updated>2016-06-07T17:21:18+00:00</updated>
<author>
<name>Christophe Simonis</name>
<email>chs@odoo.com</email>
</author>
<published>2016-06-07T17:21:18+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=3ed483caa10b526f51bed4b0f999b3567dfb7942'/>
<id>3ed483caa10b526f51bed4b0f999b3567dfb7942</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[I18N] Update translation terms from Transifex</title>
<updated>2016-06-04T22:30:55+00:00</updated>
<author>
<name>Odoo Translation Bot</name>
<email>c3p@odoo.com</email>
</author>
<published>2016-06-04T22:30:55+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=d1fa3350bb9a58cea697f9f074da8a24fad3622f'/>
<id>d1fa3350bb9a58cea697f9f074da8a24fad3622f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[MERGE] forward port of branch 9.0 up to 928bc26</title>
<updated>2016-06-02T13:12:47+00:00</updated>
<author>
<name>Christophe Simonis</name>
<email>chs@odoo.com</email>
</author>
<published>2016-06-02T13:12:47+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=a36f6dbc29fddbcc2ea51adfeb2cb6e5db5784c6'/>
<id>a36f6dbc29fddbcc2ea51adfeb2cb6e5db5784c6</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[I18N] Update translation terms from Transifex</title>
<updated>2016-05-28T22:29:48+00:00</updated>
<author>
<name>Odoo Translation Bot</name>
<email>c3p@odoo.com</email>
</author>
<published>2016-05-28T22:29:48+00:00</published>
<link rel='alternate' type='text/html' href='http://erp.ceuconsult.com:9000/Odoo/commit/?id=be91fa4c636b6a6216952e386f9872f6960d8429'/>
<id>be91fa4c636b6a6216952e386f9872f6960d8429</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
