Update to 4.8 [CI SKIP]

This commit is contained in:
Javier Uribe 2018-07-23 09:33:45 +02:00
parent 0c24ba3c1b
commit 1c5097d8aa
7 changed files with 26 additions and 9 deletions

View File

@ -7,7 +7,8 @@ pipeline:
image: ${IMAGE}
environment:
- CFLAGS=-O0
- TOX_TESTENV_PASSENV=CFLAGS
- DB_CACHE=/cache
- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
- POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
commands:
- pip install tox

View File

@ -5,8 +5,11 @@ from .location import Location, LocationHistory, Combined
def register():
Pool.register(
Combined,
module='stock_location_history_state', type_='model',
depends=['stock_location_combined'])
Pool.register(
Location,
LocationHistory,
Combined,
module='stock_location_history_state', type_='model')

View File

@ -1,4 +1,4 @@
#
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@ -90,14 +90,14 @@ msgctxt "view:stock.location:"
msgid "History"
msgstr "Historial"
msgctxt "view:stock.location:"
msgctxt "model:ir.model.button,string:location_on_button"
msgid "Start"
msgstr "Iniciar"
msgctxt "view:stock.location:"
msgctxt "model:ir.model.button,string:location_off_button"
msgid "Stop"
msgstr "Parar"
msgctxt "view:stock.location.history:"
msgid "Change Time"
msgstr "Hora modificación"
msgstr "Hora modificación"

View File

@ -35,5 +35,17 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_create" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<!-- Buttons -->
<record model="ir.model.button" id="location_on_button">
<field name="name">on</field>
<field name="string">Start</field>
<field name="model" search="[('model', '=', 'stock.location')]"/>
</record>
<record model="ir.model.button" id="location_off_button">
<field name="name">off</field>
<field name="string">Stop</field>
<field name="model" search="[('model', '=', 'stock.location')]"/>
</record>
</data>
</tryton>

View File

@ -7,6 +7,7 @@ deps =
{py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
pypy-postgresql: psycopg2cffi >= 2.5
mysql: MySQL-python
sqlite: sqlitebck
setenv =
sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}

View File

@ -1,5 +1,5 @@
[tryton]
version=4.2.0
version=4.8.0
depends:
ir
res

View File

@ -12,8 +12,8 @@ this repository contains the full copyright notices and license terms. -->
<label name="state"/>
<field name="state"/>
<group col="2" colspan="2" id="buttons">
<button string="Start" name="on" />
<button string="Stop" name="off"/>
<button name="on" />
<button name="off"/>
</group>
</group>
</xpath>