diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-06-24 10:05:29 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-06-24 10:05:29 +0530 |
| commit | e240abd8a53bbd976adca17d07d183807a770fc0 (patch) | |
| tree | 30fb5e2839f75dd5c085d7a4a46975a52abd5c4f | |
| parent | 09533ac1125fb4c518c540faa2155bc0aadd6c70 (diff) | |
Remove conflicts
bzr revid: mra@mra-laptop-20100624043529-ycm1nhj8x20un0jt
| -rw-r--r-- | addons/account/account_view.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index b686d9e30c7..86499efdc27 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -467,14 +467,13 @@ <field name="currency"/> <field name="period_id"/> <group colspan="2" col="3"> -<!-- <button name="%(action_view_account_statement_from_invoice)d"--> -<!-- string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>--> +<!-- <button name="%(action_view_account_statement_from_invoice)d" + string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>--> <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/> </group> <newline/> <field name="balance_start"/> <field name="balance_end_real"/> - </group> <notebook colspan="4"> <page string="Entry encoding"> <field colspan="4" name="line_ids" nolabel="1"> |