Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-server/trunk-company-currency-currency-field-pna
into lp:~openerp-dev/openobject-server/trunk-company-currency.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-server/trunk-company-currency-currency-field-pna/+merge/116443
Hello,
I improved company currency field and set default value in currency.
Thanks,
pna
--
https://code.launchpad.net/~openerp-commiter/openobject-server/trunk-company-currency-currency-field-pna/+merge/116443
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-company-currency.
=== modified file 'openerp/addons/base/res/res_company.py'
--- openerp/addons/base/res/res_company.py 2012-07-13 15:35:20 +0000
+++ openerp/addons/base/res/res_company.py 2012-07-24 10:28:38 +0000
@@ -228,11 +228,10 @@
self.cache_restart(cr)
return super(res_company, self).write(cr, *args, **argv)
- def _get_euro(self, cr, uid, context=None):
- try:
- return self.pool.get('res.currency').search(cr, uid, [])[0]
- except:
- return False
+ def _get_usd(self, cr, uid, context=None):
+ objid=self.pool.get('ir.model.data')
+ mid = objid._get_id(cr, uid, 'base', 'USD')
+ return objid.browse(cr, uid, mid, context=context).res_id
def _get_logo(self, cr, uid, ids):
return open(os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'res_company_logo.png'), 'rb') .read().encode('base64')
@@ -311,8 +310,15 @@
return {'value': {'rml_header': self._header_letter}}
return {'value': {'rml_header': self._header_a4}}
+ def onchange_country(self, cr, uid, ids, country_id):
+ if country_id :
+ country = self.pool.get('res.country').browse(cr, uid, country_id)
+ return {'value':{'currency_id':country.currency_id and country.currency_id.id}}
+ else :
+ return False
+
_defaults = {
- 'currency_id': _get_euro,
+ 'currency_id': _get_usd,
'paper_format': 'a4',
'rml_header':_get_header,
'rml_header2': _header2,
=== modified file 'openerp/addons/base/res/res_company_view.xml'
--- openerp/addons/base/res/res_company_view.xml 2012-07-13 16:12:22 +0000
+++ openerp/addons/base/res/res_company_view.xml 2012-07-24 10:28:38 +0000
@@ -54,7 +54,7 @@
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
<field name="zip" placeholder="ZIP" style="width: 34%%"/>
</div>
- <field name="country_id" placeholder="Country" class="oe_no_button"/>
+ <field name="country_id" placeholder="Country" on_change="onchange_country(country_id)" class="oe_no_button"/>
</div>
<field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
</group>
_______________________________________________
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
