Merge lp:~openerp-dev/openobject-addons/trunk-bug-1018871-amp into lp:openobject-addons

Proposed by Amit Parik
Status: Work in progress
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1018871-amp
Merge into: lp:openobject-addons
Diff against target: 49 lines (+5/-1)
4 files modified
account/account.py (+2/-1)
account/wizard/account_report_aged_partner_balance.py (+1/-0)
account/wizard/account_report_partner_balance.py (+1/-0)
account/wizard/account_report_partner_ledger.py (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1018871-amp
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+115023@code.launchpad.net

Description of the change

Hello,

This branch improve some object with _rec_name.

Thanks!

To post a comment you must log in.

Unmerged revisions

7052. By Amit Parik

[Fix] account : Improved the some object with rec_name

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/account.py'
--- account/account.py 2012-07-11 09:07:53 +0000
+++ account/account.py 2012-07-15 09:27:21 +0000
@@ -2605,7 +2605,8 @@
26052605
2606 With the 'nocreate' option, some accounts may not be created. Use this to add them later."""2606 With the 'nocreate' option, some accounts may not be created. Use this to add them later."""
2607 _name = 'account.addtmpl.wizard'2607 _name = 'account.addtmpl.wizard'
26082608 _rec_name = 'cparent_id'
2609
2609 def _get_def_cparent(self, cr, uid, context=None):2610 def _get_def_cparent(self, cr, uid, context=None):
2610 acc_obj = self.pool.get('account.account')2611 acc_obj = self.pool.get('account.account')
2611 tmpl_obj = self.pool.get('account.account.template')2612 tmpl_obj = self.pool.get('account.account.template')
26122613
=== modified file 'account/wizard/account_report_aged_partner_balance.py'
--- account/wizard/account_report_aged_partner_balance.py 2011-10-16 01:28:00 +0000
+++ account/wizard/account_report_aged_partner_balance.py 2012-07-15 09:27:21 +0000
@@ -28,6 +28,7 @@
28class account_aged_trial_balance(osv.osv_memory):28class account_aged_trial_balance(osv.osv_memory):
29 _inherit = 'account.common.partner.report'29 _inherit = 'account.common.partner.report'
30 _name = 'account.aged.trial.balance'30 _name = 'account.aged.trial.balance'
31 _rec_name = 'period_length'
31 _description = 'Account Aged Trial balance Report'32 _description = 'Account Aged Trial balance Report'
3233
33 _columns = {34 _columns = {
3435
=== modified file 'account/wizard/account_report_partner_balance.py'
--- account/wizard/account_report_partner_balance.py 2011-10-16 01:28:00 +0000
+++ account/wizard/account_report_partner_balance.py 2012-07-15 09:27:21 +0000
@@ -27,6 +27,7 @@
27 """27 """
28 _inherit = 'account.common.partner.report'28 _inherit = 'account.common.partner.report'
29 _name = 'account.partner.balance'29 _name = 'account.partner.balance'
30 _rec_name = 'display_partner'
30 _description = 'Print Account Partner Balance'31 _description = 'Print Account Partner Balance'
31 _columns = {32 _columns = {
32 'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]33 'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
3334
=== modified file 'account/wizard/account_report_partner_ledger.py'
--- account/wizard/account_report_partner_ledger.py 2011-10-16 01:28:00 +0000
+++ account/wizard/account_report_partner_ledger.py 2012-07-15 09:27:21 +0000
@@ -27,6 +27,7 @@
27 """27 """
28 _name = 'account.partner.ledger'28 _name = 'account.partner.ledger'
29 _inherit = 'account.common.partner.report'29 _inherit = 'account.common.partner.report'
30 _rec_name = 'initial_balance'
30 _description = 'Account Partner Ledger'31 _description = 'Account Partner Ledger'
3132
32 _columns = {33 _columns = {

Subscribers

People subscribed via source and target branches

to all changes: