Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1091590-ggh into lp:openobject-addons

  1. trunk-bug-1091590-ggh
  2. Merge into trunk
Proposed by Farid Ghanchi
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1091590-ggh
Merge into: lp:openobject-addons
Diff against target: 16 lines (+3/-3)
1 file modified
account_budget/account_budget.py (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1091590-ggh
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+141544@code.launchpad.net

Description of the change

Hello,

I had Fixed the issue of bug:1091590
Proper English Financial Terms in *account_budget* Module
      Forecast Amount instead of Planned Amount
      Budget Amount instead of Theorical Amount
      Actual Amount instead of Practical Amount

Thanks
[GGH]

To post a comment you must log in.

Unmerged revisions

8487. By Farid Ghanchi

[Fix] Fixed the issue of proper english financial terms for budgeting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_budget/account_budget.py'
2--- account_budget/account_budget.py 2012-12-17 15:23:03 +0000
3+++ account_budget/account_budget.py 2013-01-01 05:54:21 +0000
4@@ -195,9 +195,9 @@
5 'date_from': fields.date('Start Date', required=True),
6 'date_to': fields.date('End Date', required=True),
7 'paid_date': fields.date('Paid Date'),
8- 'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Account')),
9- 'practical_amount':fields.function(_prac, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
10- 'theoritical_amount':fields.function(_theo, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
11+ 'planned_amount':fields.float('Forecast Amount', required=True, digits_compute=dp.get_precision('Account')),
12+ 'practical_amount':fields.function(_prac, string='Actual Amount', type='float', digits_compute=dp.get_precision('Account')),
13+ 'theoritical_amount':fields.function(_theo, string='Budget Amount', type='float', digits_compute=dp.get_precision('Account')),
14 'percentage':fields.function(_perc, string='Percentage', type='float'),
15 'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
16 }

Subscribers

People subscribed via source and target branches

to all changes: