Fix: partial fix of test scenario, fixed model buttons, update 7.6
This commit is contained in:
parent
a4e9001bd6
commit
068f3b0e28
@ -32,7 +32,7 @@ copyright notices and license terms. -->
|
|||||||
|
|
||||||
<record model="ir.rule.group" id="rule_group_sale_device">
|
<record model="ir.rule.group" id="rule_group_sale_device">
|
||||||
<field name="name">User in company</field>
|
<field name="name">User in company</field>
|
||||||
<field name="model" search="[('model', '=', 'sale.device')]"/>
|
<field name="model">sale.device</field>
|
||||||
<field name="global_p" eval="True"/>
|
<field name="global_p" eval="True"/>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.rule" id="rule_sale_device">
|
<record model="ir.rule" id="rule_sale_device">
|
||||||
|
2
sale.py
2
sale.py
@ -164,7 +164,7 @@ class Sale(metaclass=PoolMeta):
|
|||||||
).select(
|
).select(
|
||||||
sale.id,
|
sale.id,
|
||||||
where=(And([
|
where=(And([
|
||||||
sale.total_amount_cache != None,
|
sale.total_amount_cache is not None,
|
||||||
sale.state.in_([
|
sale.state.in_([
|
||||||
'draft',
|
'draft',
|
||||||
'quotation',
|
'quotation',
|
||||||
|
4
sale.xml
4
sale.xml
@ -56,13 +56,13 @@ copyright notices and license terms. -->
|
|||||||
<record model="ir.model.button" id="sale_change_payment_method_wizard_button">
|
<record model="ir.model.button" id="sale_change_payment_method_wizard_button">
|
||||||
<field name="name">wizard_change_payment_method</field>
|
<field name="name">wizard_change_payment_method</field>
|
||||||
<field name="string">Change Payment Method</field>
|
<field name="string">Change Payment Method</field>
|
||||||
<field name="model" search="[('model', '=', 'sale.sale')]"/>
|
<field name="model">sale.sale</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.model.button" id="sale_payment_wizard_button">
|
<record model="ir.model.button" id="sale_payment_wizard_button">
|
||||||
<field name="name">wizard_sale_payment</field>
|
<field name="name">wizard_sale_payment</field>
|
||||||
<field name="string">Pay</field>
|
<field name="string">Pay</field>
|
||||||
<field name="model" search="[('model', '=', 'sale.sale')]"/>
|
<field name="model">sale.sale</field>
|
||||||
</record>
|
</record>
|
||||||
</data>
|
</data>
|
||||||
</tryton>
|
</tryton>
|
||||||
|
@ -145,7 +145,7 @@ copyright notices and license terms. -->
|
|||||||
action="act_configuration_closures_form"/>
|
action="act_configuration_closures_form"/>
|
||||||
|
|
||||||
<record model="ir.model.access" id="access_sale_statement">
|
<record model="ir.model.access" id="access_sale_statement">
|
||||||
<field name="model" search="[('model', '=', 'account.statement')]"/>
|
<field name="model">account.statement</field>
|
||||||
<field name="group" ref="sale.group_sale"/>
|
<field name="group" ref="sale.group_sale"/>
|
||||||
<field name="perm_read" eval="True"/>
|
<field name="perm_read" eval="True"/>
|
||||||
<field name="perm_write" eval="True"/>
|
<field name="perm_write" eval="True"/>
|
||||||
@ -153,7 +153,7 @@ copyright notices and license terms. -->
|
|||||||
<field name="perm_delete" eval="False"/>
|
<field name="perm_delete" eval="False"/>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.model.access" id="access_sale_statement_line">
|
<record model="ir.model.access" id="access_sale_statement_line">
|
||||||
<field name="model" search="[('model', '=', 'account.statement.line')]"/>
|
<field name="model">account.statement.line</field>
|
||||||
<field name="group" ref="sale.group_sale"/>
|
<field name="group" ref="sale.group_sale"/>
|
||||||
<field name="perm_read" eval="True"/>
|
<field name="perm_read" eval="True"/>
|
||||||
<field name="perm_write" eval="True"/>
|
<field name="perm_write" eval="True"/>
|
||||||
@ -161,7 +161,7 @@ copyright notices and license terms. -->
|
|||||||
<field name="perm_delete" eval="False"/>
|
<field name="perm_delete" eval="False"/>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.model.access" id="access_sale_statement_admin">
|
<record model="ir.model.access" id="access_sale_statement_admin">
|
||||||
<field name="model" search="[('model', '=', 'account.statement')]"/>
|
<field name="model">account.statement</field>
|
||||||
<field name="group" ref="sale.group_sale_admin"/>
|
<field name="group" ref="sale.group_sale_admin"/>
|
||||||
<field name="perm_read" eval="True"/>
|
<field name="perm_read" eval="True"/>
|
||||||
<field name="perm_write" eval="True"/>
|
<field name="perm_write" eval="True"/>
|
||||||
@ -169,7 +169,7 @@ copyright notices and license terms. -->
|
|||||||
<field name="perm_delete" eval="False"/>
|
<field name="perm_delete" eval="False"/>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.model.access" id="access_sale_statement_line_admin">
|
<record model="ir.model.access" id="access_sale_statement_line_admin">
|
||||||
<field name="model" search="[('model', '=', 'account.statement.line')]"/>
|
<field name="model">account.statement.line</field>
|
||||||
<field name="group" ref="sale.group_sale_admin"/>
|
<field name="group" ref="sale.group_sale_admin"/>
|
||||||
<field name="perm_read" eval="True"/>
|
<field name="perm_read" eval="True"/>
|
||||||
<field name="perm_write" eval="True"/>
|
<field name="perm_write" eval="True"/>
|
||||||
@ -178,7 +178,7 @@ copyright notices and license terms. -->
|
|||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.model.access" id="access_statement_account_move">
|
<record model="ir.model.access" id="access_statement_account_move">
|
||||||
<field name="model" search="[('model', '=', 'account.move')]"/>
|
<field name="model">account.move</field>
|
||||||
<field name="group" ref="account_statement.group_statement"/>
|
<field name="group" ref="account_statement.group_statement"/>
|
||||||
<field name="perm_read" eval="True"/>
|
<field name="perm_read" eval="True"/>
|
||||||
<field name="perm_write" eval="True"/>
|
<field name="perm_write" eval="True"/>
|
||||||
@ -186,7 +186,7 @@ copyright notices and license terms. -->
|
|||||||
<field name="perm_delete" eval="False"/>
|
<field name="perm_delete" eval="False"/>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.model.access" id="access_statement_account_move_line">
|
<record model="ir.model.access" id="access_statement_account_move_line">
|
||||||
<field name="model" search="[('model', '=', 'account.move.line')]"/>
|
<field name="model">account.move.line</field>
|
||||||
<field name="group" ref="account_statement.group_statement"/>
|
<field name="group" ref="account_statement.group_statement"/>
|
||||||
<field name="perm_read" eval="True"/>
|
<field name="perm_read" eval="True"/>
|
||||||
<field name="perm_write" eval="True"/>
|
<field name="perm_write" eval="True"/>
|
||||||
|
@ -116,7 +116,7 @@ Create journals::
|
|||||||
>>> StatementJournal = Model.get('account.statement.journal')
|
>>> StatementJournal = Model.get('account.statement.journal')
|
||||||
>>> Journal = Model.get('account.journal')
|
>>> Journal = Model.get('account.journal')
|
||||||
>>> SequenceType = Model.get('ir.sequence.type')
|
>>> SequenceType = Model.get('ir.sequence.type')
|
||||||
>>> sequence_type, = SequenceType.find([('name', '=', 'Account Journal')])
|
>>> sequence_type, = SequenceType.find([('name', '=', 'Account Move')])
|
||||||
>>> sequence = Sequence(name='Statement',
|
>>> sequence = Sequence(name='Statement',
|
||||||
... sequence_type=sequence_type,
|
... sequence_type=sequence_type,
|
||||||
... company=company,
|
... company=company,
|
||||||
@ -124,7 +124,6 @@ Create journals::
|
|||||||
>>> sequence.save()
|
>>> sequence.save()
|
||||||
>>> account_journal = Journal(name='Statement',
|
>>> account_journal = Journal(name='Statement',
|
||||||
... type='statement',
|
... type='statement',
|
||||||
... sequence=sequence,
|
|
||||||
... )
|
... )
|
||||||
>>> account_journal.save()
|
>>> account_journal.save()
|
||||||
>>> statement_journal = StatementJournal(name='Default',
|
>>> statement_journal = StatementJournal(name='Default',
|
||||||
@ -174,7 +173,7 @@ Create account user::
|
|||||||
>>> account_user = User()
|
>>> account_user = User()
|
||||||
>>> account_user.name = 'Account'
|
>>> account_user.name = 'Account'
|
||||||
>>> account_user.login = 'account'
|
>>> account_user.login = 'account'
|
||||||
>>> account_group, = Group.find([('name', '=', 'Account')])
|
>>> account_group, = Group.find([('name', '=', 'Accounting')])
|
||||||
>>> account_user.groups.append(account_group)
|
>>> account_user.groups.append(account_group)
|
||||||
>>> account_user.shops.append(shop)
|
>>> account_user.shops.append(shop)
|
||||||
>>> account_user.shop = shop
|
>>> account_user.shop = shop
|
||||||
@ -191,6 +190,7 @@ Sale services::
|
|||||||
>>> sale_line = sale.lines.new()
|
>>> sale_line = sale.lines.new()
|
||||||
>>> sale_line.product = product
|
>>> sale_line.product = product
|
||||||
>>> sale_line.quantity = 2.0
|
>>> sale_line.quantity = 2.0
|
||||||
|
>>> sale_line.unit_price = Decimal('10.00')
|
||||||
>>> sale.save()
|
>>> sale.save()
|
||||||
>>> len(sale.shipments), len(sale.invoices), len(sale.payments)
|
>>> len(sale.shipments), len(sale.invoices), len(sale.payments)
|
||||||
(0, 0, 0)
|
(0, 0, 0)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[tryton]
|
[tryton]
|
||||||
version=6.8.0
|
version=7.6.0
|
||||||
depends:
|
depends:
|
||||||
account_statement
|
account_statement
|
||||||
sale_shop
|
sale_shop
|
||||||
|
Loading…
Reference in New Issue
Block a user