Jalpesh Patel(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons21-settings-pja into
lp:openobject-addons.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons21-settings-pja/+merge/135352
Hello sir,
I have fix problem of 1> send by mail on quotations it's given warning
: Context mismatch, report to xmo.
2> Settings/Configuration/Accounting => select company OpenERP BE and
select Belgian PCMN chart and click on apply and it's given trace back.
3> Configuration => Accounting, add a bank account in the Bank&Cash
section (click on "Configure your campany bank accounts") and then save the
form it's given trace back.
Thanks!
pja
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons21-settings-pja/+merge/135352
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons21-settings-pja.
=== modified file 'account/account_bank.py'
--- account/account_bank.py 2012-10-02 10:29:15 +0000
+++ account/account_bank.py 2012-11-21 10:16:16 +0000
@@ -45,12 +45,12 @@
def _prepare_name_get(self, cr, uid, bank_dicts, context=None):
"""Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type"""
- currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if data['currency_id']))
+ currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if data.get('currency_id')))
currencies = self.pool.get('res.currency').browse(cr, uid, currency_ids, context=context)
currency_name = dict((currency.id, currency.name) for currency in currencies)
for data in bank_dicts:
- data['currency_name'] = data['currency_id'] and currency_name[data['currency_id'][0]] or ''
+ data['currency_name'] = data.get('currency_id') and currency_name[data['currency_id'][0]] or ''
return super(bank, self)._prepare_name_get(cr, uid, bank_dicts, context=context)
def post_write(self, cr, uid, ids, context=None):
=== modified file 'l10n_br/account.py'
--- l10n_br/account.py 2012-08-31 13:51:36 +0000
+++ l10n_br/account.py 2012-11-21 10:16:16 +0000
@@ -131,7 +131,7 @@
def execute(self, cr, uid, ids, context=None):
- super(wizard_multi_charts_accounts, self).execute(cr, uid, ids, context)
+ res = super(wizard_multi_charts_accounts, self).execute(cr, uid, ids, context)
obj_multi = self.browse(cr, uid, ids[0])
obj_acc_tax = self.pool.get('account.tax')
@@ -165,7 +165,7 @@
for tax in self.pool.get('account.tax').browse(cr, uid, tax_ids, context=context):
if tax.tax_code_id:
obj_acc_tax.write(cr, uid, tax.id, {'domain': tax.tax_code_id.domain,'tax_discount': tax.tax_code_id.tax_discount})
-
+ return res
wizard_multi_charts_accounts()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mail/static/src/js/mail.js'
--- mail/static/src/js/mail.js 2012-11-20 09:06:02 +0000
+++ mail/static/src/js/mail.js 2012-11-21 10:16:16 +0000
@@ -26,7 +26,7 @@
'default_use_template', 'default_partner_ids', 'default_model',
'default_res_id', 'default_content_subtype', 'default_subject',
'default_body', 'active_id', 'lang', 'bin_raw', 'tz',
- 'active_model', 'edi_web_url_view', 'active_ids',
+ 'active_model', 'edi_web_url_view', 'active_ids', 'uid',
'default_attachment_ids']
for (var key in action.context) {
if (_.indexOf(context_keys, key) == -1) {
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
