Merge PR #301 into 12.0

Signed-off-by JordiBForgeFlow
This commit is contained in:
OCA-git-bot
2020-06-10 07:49:57 +00:00
4 changed files with 6 additions and 14 deletions

View File

@@ -164,5 +164,5 @@ class AccountBankStatementImportPayPalMappingWizard(models.TransientModel):
'res_id': mapping.id,
'view_mode': 'form',
'view_id': False,
'target': 'new',
'target': 'current',
}

View File

@@ -143,12 +143,8 @@
</group>
</group>
</xpath>
<xpath expr="//div[@name='final_buttons']/button" position="attributes">
<attribute name="class">btn-default</attribute>
<attribute name="string">Cancel</attribute>
</xpath>
<xpath expr="//div[@name='final_buttons']/button" position="before">
<button name="import_mapping" string="Import" type="object" class="btn-primary" />
<xpath expr="//div[@name='states_buttons']/button" position="before">
<button name="import_mapping" string="Import" type="object" class="btn-primary" attrs="{'invisible': [('state', '!=', 'final')]}"/>
</xpath>
</field>
</record>

View File

@@ -187,5 +187,5 @@ class AccountBankStatementImportSheetMappingWizard(models.TransientModel):
'res_id': mapping.id,
'view_mode': 'form',
'view_id': False,
'target': 'new',
'target': 'current',
}

View File

@@ -121,12 +121,8 @@
</group>
</group>
</xpath>
<xpath expr="//div[@name='final_buttons']/button" position="attributes">
<attribute name="class">btn-default</attribute>
<attribute name="string">Cancel</attribute>
</xpath>
<xpath expr="//div[@name='final_buttons']/button" position="before">
<button name="import_mapping" string="Import" type="object" class="btn-primary" />
<xpath expr="//div[@name='states_buttons']/button" position="before">
<button name="import_mapping" string="Import" type="object" class="btn-primary" attrs="{'invisible': [('state', '!=', 'final')]}"/>
</xpath>
</field>
</record>