Release 3.6 version
This commit is contained in:
parent
e287dbff0e
commit
84e520771c
|
@ -42,9 +42,7 @@ class SaleDevice(ModelSQL, ModelView):
|
||||||
|
|
||||||
@fields.depends('shop')
|
@fields.depends('shop')
|
||||||
def on_change_shop(self):
|
def on_change_shop(self):
|
||||||
return {
|
self.company = self.shop.company.id if self.shop else None
|
||||||
'company': self.shop.company.id if self.shop else None
|
|
||||||
}
|
|
||||||
|
|
||||||
def get_company(self, name):
|
def get_company(self, name):
|
||||||
return self.shop.company.id
|
return self.shop.company.id
|
||||||
|
|
|
@ -220,7 +220,7 @@ msgstr "Pagos"
|
||||||
|
|
||||||
msgctxt "field:sale.sale,residual_amount:"
|
msgctxt "field:sale.sale,residual_amount:"
|
||||||
msgid "Residual Amount"
|
msgid "Residual Amount"
|
||||||
msgstr "Cambio"
|
msgstr "Saldo"
|
||||||
|
|
||||||
msgctxt "field:sale.sale,sale_device:"
|
msgctxt "field:sale.sale,sale_device:"
|
||||||
msgid "Sale Device"
|
msgid "Sale Device"
|
||||||
|
|
|
@ -157,7 +157,6 @@ class OpenStatement(Wizard):
|
||||||
pool = Pool()
|
pool = Pool()
|
||||||
User = pool.get('res.user')
|
User = pool.get('res.user')
|
||||||
Statement = pool.get('account.statement')
|
Statement = pool.get('account.statement')
|
||||||
Journal = pool.get('account.statement.journal')
|
|
||||||
|
|
||||||
user = Transaction().user
|
user = Transaction().user
|
||||||
user = User(user)
|
user = User(user)
|
||||||
|
@ -249,7 +248,6 @@ class CloseStatement(Wizard):
|
||||||
pool = Pool()
|
pool = Pool()
|
||||||
User = pool.get('res.user')
|
User = pool.get('res.user')
|
||||||
Statement = pool.get('account.statement')
|
Statement = pool.get('account.statement')
|
||||||
Journal = pool.get('account.statement.journal')
|
|
||||||
|
|
||||||
user = Transaction().user
|
user = Transaction().user
|
||||||
user = User(user)
|
user = User(user)
|
||||||
|
|
|
@ -8,7 +8,8 @@ copyright notices and license terms. -->
|
||||||
<record model="ir.action.act_window" id="act_sale_statement_form">
|
<record model="ir.action.act_window" id="act_sale_statement_form">
|
||||||
<field name="name">Statements</field>
|
<field name="name">Statements</field>
|
||||||
<field name="res_model">account.statement</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>
|
||||||
<record model="ir.action.act_window.view" id="act_sale_statement_form_view1">
|
<record model="ir.action.act_window.view" id="act_sale_statement_form_view1">
|
||||||
<field name="sequence" eval="10"/>
|
<field name="sequence" eval="10"/>
|
||||||
|
@ -24,21 +25,24 @@ copyright notices and license terms. -->
|
||||||
id="act_sale_statement_form_domain_draft">
|
id="act_sale_statement_form_domain_draft">
|
||||||
<field name="name">Draft</field>
|
<field name="name">Draft</field>
|
||||||
<field name="sequence" eval="10"/>
|
<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"/>
|
<field name="act_window" ref="act_sale_statement_form"/>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.action.act_window.domain"
|
<record model="ir.action.act_window.domain"
|
||||||
id="act_sale_statement_form_domain_validated">
|
id="act_sale_statement_form_domain_validated">
|
||||||
<field name="name">Validated</field>
|
<field name="name">Validated</field>
|
||||||
<field name="sequence" eval="20"/>
|
<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"/>
|
<field name="act_window" ref="act_sale_statement_form"/>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.action.act_window.domain"
|
<record model="ir.action.act_window.domain"
|
||||||
id="act_sale_statement_form_domain_posted">
|
id="act_sale_statement_form_domain_posted">
|
||||||
<field name="name">Posted</field>
|
<field name="name">Posted</field>
|
||||||
<field name="sequence" eval="30"/>
|
<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"/>
|
<field name="act_window" ref="act_sale_statement_form"/>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.action.act_window.domain"
|
<record model="ir.action.act_window.domain"
|
||||||
|
@ -48,7 +52,6 @@ copyright notices and license terms. -->
|
||||||
<field name="domain"></field>
|
<field name="domain"></field>
|
||||||
<field name="act_window" ref="act_sale_statement_form"/>
|
<field name="act_window" ref="act_sale_statement_form"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<menuitem name="Statements" parent="sale.menu_sale"
|
<menuitem name="Statements" parent="sale.menu_sale"
|
||||||
action="act_sale_statement_form"
|
action="act_sale_statement_form"
|
||||||
id="menu_sale_statement" sequence="70"/>
|
id="menu_sale_statement" sequence="70"/>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[tryton]
|
[tryton]
|
||||||
version=3.4.0
|
version=3.6.0
|
||||||
depends:
|
depends:
|
||||||
account_statement
|
account_statement
|
||||||
sale_shop
|
sale_shop
|
||||||
|
|
Loading…
Reference in New Issue