odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

PicklingError: Can't pickle <class 'etree.XMLSyntaxError'>: import of module etree failed 

bzr revid: patelamit2003@gmail.com-20081023111043-nnsbbwqkpq0z7l52
This commit is contained in:
apa-tiny 2008-10-23 16:40:43 +05:30
parent f5de24bec6
commit 37b97c00a4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/account_wizard.xml
View File

@ -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" />