From 84e520771cff591b29b857d5430a33a96e0ae932 Mon Sep 17 00:00:00 2001
From: Oscar Alvarez <oscar.alvarez.montero@gmail.com>
Date: Wed, 5 Aug 2015 07:30:10 -0500
Subject: [PATCH] Release 3.6 version

---
 device.py       |  4 +---
 locale/es_CO.po |  2 +-
 statement.py    |  2 --
 statement.xml   | 13 ++++++++-----
 tryton.cfg      |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/device.py b/device.py
index 826d221..4a3625e 100644
--- a/device.py
+++ b/device.py
@@ -42,9 +42,7 @@ class SaleDevice(ModelSQL, ModelView):
 
     @fields.depends('shop')
     def on_change_shop(self):
-        return {
-            'company': self.shop.company.id if self.shop else None
-        }
+        self.company = self.shop.company.id if self.shop else None
 
     def get_company(self, name):
         return self.shop.company.id
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 8230091..20d070e 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -220,7 +220,7 @@ msgstr "Pagos"
 
 msgctxt "field:sale.sale,residual_amount:"
 msgid "Residual Amount"
-msgstr "Cambio"
+msgstr "Saldo"
 
 msgctxt "field:sale.sale,sale_device:"
 msgid "Sale Device"
diff --git a/statement.py b/statement.py
index 01120a1..8843bd5 100644
--- a/statement.py
+++ b/statement.py
@@ -157,7 +157,6 @@ class OpenStatement(Wizard):
         pool = Pool()
         User = pool.get('res.user')
         Statement = pool.get('account.statement')
-        Journal = pool.get('account.statement.journal')
 
         user = Transaction().user
         user = User(user)
@@ -249,7 +248,6 @@ class CloseStatement(Wizard):
         pool = Pool()
         User = pool.get('res.user')
         Statement = pool.get('account.statement')
-        Journal = pool.get('account.statement.journal')
 
         user = Transaction().user
         user = User(user)
diff --git a/statement.xml b/statement.xml
index b54901e..6fd2ed4 100644
--- a/statement.xml
+++ b/statement.xml
@@ -8,7 +8,8 @@ copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_sale_statement_form">
             <field name="name">Statements</field>
             <field name="res_model">account.statement</field>
-            <field name="domain">[('users', '=', Eval('_user'))]</field>
+            <field name="domain" eval="[('users', '=', Eval('_user'))]"
+                    pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_sale_statement_form_view1">
             <field name="sequence" eval="10"/>
@@ -24,21 +25,24 @@ copyright notices and license terms. -->
             id="act_sale_statement_form_domain_draft">
             <field name="name">Draft</field>
             <field name="sequence" eval="10"/>
-            <field name="domain">[('state', '=', 'draft')]</field>
+            <field name="domain" eval="[('state', '=', 'draft')]"
+                pyson="1"/>
             <field name="act_window" ref="act_sale_statement_form"/>
         </record>
         <record model="ir.action.act_window.domain"
             id="act_sale_statement_form_domain_validated">
             <field name="name">Validated</field>
             <field name="sequence" eval="20"/>
-            <field name="domain">[('state', '=', 'validated')]</field>
+            <field name="domain" eval="[('state', '=', 'validated')]"
+                pyson="1"/>
             <field name="act_window" ref="act_sale_statement_form"/>
         </record>
         <record model="ir.action.act_window.domain"
             id="act_sale_statement_form_domain_posted">
             <field name="name">Posted</field>
             <field name="sequence" eval="30"/>
-            <field name="domain">[('state', '=', 'posted')]</field>
+            <field name="domain" eval="[('state', '=', 'posted')]"
+                pyson="1"/>
             <field name="act_window" ref="act_sale_statement_form"/>
         </record>
         <record model="ir.action.act_window.domain"
@@ -48,7 +52,6 @@ copyright notices and license terms. -->
             <field name="domain"></field>
             <field name="act_window" ref="act_sale_statement_form"/>
         </record>
-
         <menuitem name="Statements" parent="sale.menu_sale"
             action="act_sale_statement_form"
             id="menu_sale_statement" sequence="70"/>
diff --git a/tryton.cfg b/tryton.cfg
index d52e3c3..9a0e2fb 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.0
+version=3.6.0
 depends:
     account_statement
     sale_shop