Merge lp:~openerp-commiter/openobject-server/trunk-company-currency-currency-field-pna into lp:~openerp-dev/openobject-server/trunk-company-currency

Proposed by Pinakin Nayi (OpenERP)
Status: Rejected
Rejected by: Priyesh (OpenERP)
Proposed branch: lp:~openerp-commiter/openobject-server/trunk-company-currency-currency-field-pna
Merge into: lp:~openerp-dev/openobject-server/trunk-company-currency
Diff against target: 49 lines (+13/-7)
2 files modified
openerp/addons/base/res/res_company.py (+12/-6)
openerp/addons/base/res/res_company_view.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-server/trunk-company-currency-currency-field-pna
Reviewer Review Type Date Requested Status
Priyesh (OpenERP) Disapprove
Review via email: mp+116443@code.launchpad.net

Description of the change

Hello,

  I improved company currency field and set default value in currency.

Thanks,
pna

To post a comment you must log in.
Revision history for this message
Priyesh (OpenERP) (pso-openerp) wrote :

As this functionality is not required anymore, I am rejecting your branch.
Thanks for your work,
Priyesh

review: Disapprove

Unmerged revisions

4249. By Pinakin Nayi (OpenERP)

[IMP]company-currency

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/res/res_company.py'
2--- openerp/addons/base/res/res_company.py 2012-07-13 15:35:20 +0000
3+++ openerp/addons/base/res/res_company.py 2012-07-24 10:28:38 +0000
4@@ -228,11 +228,10 @@
5 self.cache_restart(cr)
6 return super(res_company, self).write(cr, *args, **argv)
7
8- def _get_euro(self, cr, uid, context=None):
9- try:
10- return self.pool.get('res.currency').search(cr, uid, [])[0]
11- except:
12- return False
13+ def _get_usd(self, cr, uid, context=None):
14+ objid=self.pool.get('ir.model.data')
15+ mid = objid._get_id(cr, uid, 'base', 'USD')
16+ return objid.browse(cr, uid, mid, context=context).res_id
17
18 def _get_logo(self, cr, uid, ids):
19 return open(os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'res_company_logo.png'), 'rb') .read().encode('base64')
20@@ -311,8 +310,15 @@
21 return {'value': {'rml_header': self._header_letter}}
22 return {'value': {'rml_header': self._header_a4}}
23
24+ def onchange_country(self, cr, uid, ids, country_id):
25+ if country_id :
26+ country = self.pool.get('res.country').browse(cr, uid, country_id)
27+ return {'value':{'currency_id':country.currency_id and country.currency_id.id}}
28+ else :
29+ return False
30+
31 _defaults = {
32- 'currency_id': _get_euro,
33+ 'currency_id': _get_usd,
34 'paper_format': 'a4',
35 'rml_header':_get_header,
36 'rml_header2': _header2,
37
38=== modified file 'openerp/addons/base/res/res_company_view.xml'
39--- openerp/addons/base/res/res_company_view.xml 2012-07-13 16:12:22 +0000
40+++ openerp/addons/base/res/res_company_view.xml 2012-07-24 10:28:38 +0000
41@@ -54,7 +54,7 @@
42 <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
43 <field name="zip" placeholder="ZIP" style="width: 34%%"/>
44 </div>
45- <field name="country_id" placeholder="Country" class="oe_no_button"/>
46+ <field name="country_id" placeholder="Country" on_change="onchange_country(country_id)" class="oe_no_button"/>
47 </div>
48 <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
49 </group>

Subscribers

People subscribed via source and target branches