diff options
| author | apa-tiny <patelamit2003@gmail.com> | 2008-10-23 16:40:43 +0530 |
|---|---|---|
| committer | apa-tiny <patelamit2003@gmail.com> | 2008-10-23 16:40:43 +0530 |
| commit | 37b97c00a40aa4bca5b82ff348e3a987b6eddcad (patch) | |
| tree | b01e1fdd8af9f83bbb88673052131d1ab1eb0fb6 | |
| parent | f5de24bec6e2528fcd45273559c650c1cf8f750d (diff) | |
PicklingError: Can't pickle <class 'etree.XMLSyntaxError'>: import of module etree failed
bzr revid: patelamit2003@gmail.com-20081023111043-nnsbbwqkpq0z7l52
| -rw-r--r-- | addons/account/account_wizard.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml index 70d63123a36..525fa46607a 100644 --- a/addons/account/account_wizard.xml +++ b/addons/account/account_wizard.xml @@ -89,13 +89,13 @@ <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" /> <menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" /> -<<<<<<< TREE + <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Print Central journal" /> <menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_central_journal" parent="account.menu_generic_report" type="wizard" /> -======= + <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Central Journal" /> <menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_cetral_journal" parent="account.menu_generic_report" type="wizard" /> ->>>>>>> MERGE-SOURCE + <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General journal" /> <menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" /> |