gpa(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-574101-gpa into
lp:openobject-addons/6.1.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-574101-gpa/+merge/106330
Hello Sir,
[Fix] account_voucher: Open any journal and select action Voucher Entries then
click on
FORM or NEW ERROR generated
Steps to reproduce:
1. Go to menu Accounting/Configuration/Financial
Accounting/Journals/Journals
2. Open any journal and select action "Voucher Entries" then click on
"FORM" or "NEW" ERROR generated.
This issue is fixed on this branch.
Please review the code.
Thanks
GPA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-574101-gpa/+merge/106330
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-574101-gpa.
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml 2012-01-31 13:36:57 +0000
+++ account_voucher/account_voucher_view.xml 2012-05-18 08:34:48 +0000
@@ -12,6 +12,7 @@
<field name="reference"/>
<field name="partner_id"/>
<field name="journal_id"/>
+ <field name="company_id" invisible="1"/>
<field name="period_id" groups="base.group_extended" invisible="context.get('visible', True)"/>
<field name="type" invisible="context.get('visible', True)"/>
<field name="amount" sum="Total Amount"/>
=== modified file 'crm/wizard/crm_merge_opportunities.py'
--- crm/wizard/crm_merge_opportunities.py 2011-12-19 16:54:40 +0000
+++ crm/wizard/crm_merge_opportunities.py 2012-05-18 08:34:48 +0000
@@ -52,6 +52,8 @@
opp_ids = []
opps = self.pool.get('crm.lead').browse(cr, uid, record_ids, context=context)
for opp in opps:
+ if opp.type == 'lead':
+ raise osv.except_osv(_('Warning !'),_('Leads can not be merge'))
if opp.state not in ('done', 'cancel'):
opp_ids.append(opp.id)
if 'opportunity_ids' in fields:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
