merge
This commit is contained in:
commit
3fede181cc
2 files changed
+9
-16
No files matched your search
+6
-10
@@ -260,12 +260,10 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
|
||||
amount_to_pay - abs(line['amount'])
|
||||
return res
|
||||
|
||||
def set_state_validated(self, statement_id):
|
||||
def wkf_validated(self, statement):
|
||||
statement_line_obj = Pool().get('account.statement.line')
|
||||
lang_obj = Pool().get('ir.lang')
|
||||
|
||||
statement = self.browse(statement_id)
|
||||
|
||||
computed_end_balance = statement.start_balance
|
||||
for line in statement.lines:
|
||||
computed_end_balance += line.amount
|
||||
@@ -284,25 +282,23 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
|
||||
self.raise_user_error('wrong_end_balance', error_args=(amount,))
|
||||
for line in statement.lines:
|
||||
statement_line_obj.create_move(line)
|
||||
self.write(statement_id, {
|
||||
self.write(statement.id, {
|
||||
'state':'validated',
|
||||
})
|
||||
|
||||
def set_state_posted(self, statement_id):
|
||||
def wkf_posted(self, statement):
|
||||
statement_line_obj = Pool().get('account.statement.line')
|
||||
|
||||
statement = self.browse(statement_id)
|
||||
statement_line_obj.post_move(statement.lines)
|
||||
self.write(statement_id, {
|
||||
self.write(statement.id, {
|
||||
'state':'posted',
|
||||
})
|
||||
|
||||
def set_state_cancel(self, statement_id):
|
||||
def wkf_cancel(self, statement):
|
||||
statement_line_obj = Pool().get('account.statement.line')
|
||||
|
||||
statement = self.browse(statement_id)
|
||||
statement_line_obj.delete_move(statement.lines)
|
||||
self.write(statement_id, {
|
||||
self.write(statement.id, {
|
||||
'state':'cancel',
|
||||
})
|
||||
|
||||
|
||||
+3
-6
@@ -216,21 +216,18 @@ this repository contains the full copyright notices and license terms. -->
|
||||
</record>
|
||||
<record model="workflow.activity" id="statement_act_validated">
|
||||
<field name="workflow" ref="wkf_statement"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">set_state_validated()</field>
|
||||
<field name="method">wkf_validated</field>
|
||||
<field name="name">Validated</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="statement_act_posted">
|
||||
<field name="workflow" ref="wkf_statement"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">set_state_posted()</field>
|
||||
<field name="method">wkf_posted</field>
|
||||
<field name="name">Posted</field>
|
||||
<field name="flow_stop" eval="True"/>
|
||||
</record>
|
||||
<record model="workflow.activity" id="statement_act_cancel">
|
||||
<field name="workflow" ref="wkf_statement"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">set_state_cancel()</field>
|
||||
<field name="method">wkf_cancel</field>
|
||||
<field name="name">Canceled</field>
|
||||
<field name="flow_stop" eval="True"/>
|
||||
</record>
|
||||
|
||||
Reference in new issue
Block a user