Commit Graph

31 Commits

Author SHA1 Message Date
Christophe Simonis 31f2a1bc38 [MERGE] forward port of branch 7.0 up to 1c0bc7c 2015-06-30 12:47:27 +02:00
Stéphane Bidoul da9d1a8c45 [FIX] account_budget: support view and consolidation children in budget positions
In account_budget module,
when creating a budget position,
the user can select view accounts and also accounts with consolidation children,
in addition to normal accounts.

However, when viewing budgets with positions containing only view accounts,
the "practical amount" field was always zero.

Since these type of accounts are accepted as budget positions,
the system should take into account children and consolidation children
when computing the practical amount.

Fixes #372
Closes #1247
2015-06-24 18:21:11 +02:00
Martin Trigaux 7bcefaf232 Forward port of branch 7.0 up to 0ab88f5 2014-08-21 17:57:57 +02:00
fka-odoo 20a99ae129 [IMP] account_budget: added date filter in print budget report
Fixes #1743, opw 611307
2014-08-21 11:45:38 +02:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Sandy Carter 5597c25acf [FIX] Fix account_budget name unicode error
Fix bug https://bugs.launchpad.net/openobject-addons/+bug/1292245:
    Invoice budget's warning when crossovered budget lines are not related
    to any account will cause a UnicodeEncodeError if the account has
    unicode-only characters such as é.

Make sure that the budget name is a unicode to avoid UnicodeEncodeError
which happens when budget name contains UTF-8 characters.

Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
2014-05-16 16:46:39 -04:00
Olivier Dony fb19b54ff9 [MERGE] Forward-port of 7.0 bugfixes up to rev 9976 rev-id: odo@openerp.com-20140411142429-y0rpkzqbrsabxqsg
bzr revid: odo@openerp.com-20140411142800-t8sbcmfkj3qgmrh3
2014-04-11 16:28:00 +02:00
Ravi Gohil (OpenERP) 091de4eb75 [FIX] account_budget: Added missing 1 day in the(to the elapsed days and total days) calculation of 'Theoretical Amount' in order to have correct amount value for it. (Maintenance Case: 606232)
bzr revid: rgo@tinyerp.com-20140404070254-ey27l4kq6d1vypq9
2014-04-04 12:32:54 +05:30
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Cecile Tonglet a3939acfa5 [FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision
bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d
2012-12-17 16:23:03 +01:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Fabien Pinckaers 6028d39466 [IMP] analytic account not required on budgets
bzr revid: fp@tinyerp.com-20121215164718-yodnoep77obff2ul
2012-12-15 17:47:18 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Amit Patel (OpenERP) dced77cc16 [MERGE]:lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-account_budget-mma
bzr revid: apa@tinyerp.com-20120504125911-rpem066wpdhzwxxa
2012-05-04 18:29:11 +05:30
fp 8aff5209ea [IMP] improved error message, constraints must allways propose a solution
bzr revid: fp@fp-laptop-20111231075720-4kak7o320td4wxqc
2011-12-31 08:57:20 +01:00
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
Anup (OpenERP) f7505ecfca [FIX] account_budget : Reports were crashing due to Analytic Account not being mandatory, Fixed it.(Support Case 4577)
bzr revid: ach@tinyerp.com-20110321110519-8nh05bh8z0bwqjrq
2011-03-21 16:35:19 +05:30
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
mtr c09cfb3da6 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20101230122728-fzu06fer45dt1x8e
2010-12-30 17:57:28 +05:30
mtr 62fa56a25e [IMP] Account_budget:corrected the spelling 'theoritical' to 'theoretical'
bzr revid: mtr@mtr-20101230103028-13a7y2z2jptfxqn6
2010-12-30 16:00:28 +05:30
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
Mustufa Rangwala b0f61a9546 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9
bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
2010-12-17 10:07:32 +05:30
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
Mustufa Rangwala 2be2c91eff [FIX] Account_budget: account_budget bad percentage computation on budget line
lp bug: https://launchpad.net/bugs/675552 fixed

bzr revid: mra@mra-laptop-20101209095430-j6958zgmppzdtjmj
2010-12-09 15:24:30 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'.
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
JMA(OpenERP) 1d537d4724 [FIX] Account_Budget : Correction on functional field calculation
lp bug: https://launchpad.net/bugs/663279 fixed

bzr revid: jvo@tinyerp.com-20101020135421-hd6koh378ojcrp08
2010-10-20 19:24:21 +05:30
psi (Open ERP) d3ec53d235 [IMP] account_budget: Remove object account.budget.post.dotation and Report correction
bzr revid: psi@tinyerp.co.in-20101012125050-j9vpgsg2y6cw9i4j
2010-10-12 18:20:50 +05:30
ARA (OpenERP) 772ac664ba [FIX] account analytic plan, account budget, hr_timesheet, project_planning: Fix warning on Openerp TEst
bzr revid: ara@tinyerp.com-20101005070021-1djnjreztc8z6ix5
2010-10-05 12:30:21 +05:30
ARA (OpenERP) c791e55ef6 [IMP] Account: Access rights for Analytic Account (Add analytic group on all modules) where this field appear
bzr revid: ara@tinyerp.com-20101004111344-8rx877ce28g5eigv
2010-10-04 16:43:44 +05:30
psi (Open ERP) 361005df7e [IMP] account_budget: Rename files
bzr revid: psi@tinyerp.co.in-20101001131038-metbescbnv58qjmk
2010-10-01 18:40:38 +05:30