Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.0-opw-5629-jvo into lp:openobject-addons/6.0

  1. 6.0-opw-5629-jvo
  2. Merge into 6.0
Proposed by Jay Vora (Serpent Consulting Services)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.0-opw-5629-jvo
Merge into: lp:openobject-addons/6.0
Diff against target: 316 lines (+76/-61)
6 files modified
account/report/account_balance_sheet.py (+10/-2)
account/report/account_balance_sheet.rml (+14/-14)
account/report/account_balance_sheet_horizontal.rml (+16/-16)
account/report/account_profit_horizontal.rml (+23/-23)
account/report/account_profit_loss.py (+7/-0)
account/report/account_profit_loss.rml (+6/-6)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.0-opw-5629-jvo
Reviewer Review Type Date Requested Status
Jay Vora (Serpent Consulting Services) (community) Approve
Review via email: mp+60751@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openobject-addons/6.0-opw-5629-jvo updated
4578. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged the branch for the fix of lp:763439

4579. By Anup(SerpentCS)

[FIX] account : Move lines take the Journal and Period from the Move itself(Maintenance Case 5598)

4580. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4581. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4582. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4583. By Tristan Hill (credativ)

[MERGE] Merged Tristan Hill (credativ)'s branch for the fix of bug lp:733799

4584. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4585. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Rifakat's branch for the fix of onchange call

4586. By Jay Vora (Serpent Consulting Services)

[FIX] Purchase_requisition : Corrections and removed the unnecessary dependency of mrp

4587. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4588. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Valencia's branch for the fix of __compute method on account correctiosn when account is set to inActive

4589. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Dhruti's branch for the fix of the problem when base_contact disturbs the thunderbird

4590. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4591. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Anup's branch for the fix of invoice creation from repairs

4592. By Jay Vora (Serpent Consulting Services)

[REF] Stock : Improvements

4593. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Rifakat's branch which contains the fix of invoice progressbar which was showing wrong value by not considering the residual amount(It could have failed when the invoice is partially paid)

4594. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4595. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4596. By Jay Vora (Serpent Consulting Services)

Merged Tejas' branch for the fix of wrong reporting of product margin(Thanks to Rifakat for review)

4597. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Somesh' branch for the fix of domain correction for Sale Order's 'Invoice On' Policy

4598. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Amit Dodiya's branch for the fix of fields_view_get() failing on list view display of account.voucher

4599. By Anup(SerpentCS)

[MERGE] Merged RGO's branch for Query fix in Sale Manager Analysis Report(Case:5689)

4600. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4601. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4602. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4603. By Conexus.at

[ADD] l10n_at: added localization module for austria. Thanks Conexus.at

4604. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4605. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4606. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4607. By Priyesh (OpenERP)

[MERGE] Merge SKH's branch to remove duplicates on name_search (case:5861) branch: lp:~openerp-dev/openobject-addons/6.0-opw-5861-skh

4608. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4609. By Anup(SerpentCS)

[MERGE] purchase : Merged Ravi's Branch for the purchase report query fix. (Case:5943)

4610. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4611. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4612. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4613. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged ADO's branch for the fix of partial picking getting failed while product has no company configured

4614. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4615. By Jay Vora (Serpent Consulting Services)

[FIX] Corrected the context for the act_window of Phonecall from Partner

4616. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged RGO's branch for the fix of wrong _defaults on stock module

4617. By Jay Vora (Serpent Consulting Services)

[FIX] Successive fix over the bug lp:777347

4618. By Jay Vora (Serpent Consulting Services)

[FIX] CRM/Project_planning : Corrected Yml tests,thanks to buildbot

4619. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4620. By Jay Vora (Serpent Consulting Services)

[FIX] HR_Payroll/Hr_recruitment/Membership/Point_of_sale/Project_timesheet : Corrected Yml tests,thanks to buildbot

4621. By Jay Vora (Serpent Consulting Services)

[FIX] HR_Payroll/Hr_recruitment/Membership/Point_of_sale/Project_timesheet : Corrected Yml tests,thanks to buildbot

4622. By Jay Vora (Serpent Consulting Services)

[FIX] Product_visible_discount : Correction in the __openerp__.py for the dependency module and fix the onchange methods for sale order line and invoice line(Ref : Case 5998)

4623. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged RGO's branch for the fix of Stock : Corrected _defaults for date/time fields

4624. By Jay Vora (Serpent Consulting Services)

[FIX] Project_scrum/Purchase_requisition : Corrected _defaults for date/datetime values

4625. By Jay Vora (Serpent Consulting Services)

[FIX/REF] Minor but Important fixes

4626. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4627. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4628. By Anup(SerpentCS)

[FIX] account_invoice_layout : Fixed the issue with the account in invoice lines when multicompany environment is used(Case:5805)

4629. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4630. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4631. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4632. By Jay Vora (Serpent Consulting Services)

[FIX] account_followup: corrected the followup report getting called from wizard

4633. By Jay Vora (Serpent Consulting Services)

[FIX] Backported the fix from trunk for the module Audittrail : audit_trail settings should be readable by everyone, not just the user in employee group

4634. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged from Parent branch

4635. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Oliver Dony's branch for the fixes of share module

4636. By Mohammed Shekha(Open ERP)

[FIX] Domain should be in list.

4637. By Jay Vora (Serpent Consulting Services)

[REVERTER] Reverted MSH's fix for share module

4638. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged the branch for the fix of hr_holidays

Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) wrote :

Editing compatible sxw files would be a good solution.

review: Approve
Reply
lp:~openerp-dev/openobject-addons/6.0-opw-5629-jvo updated
4639. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Rifakat's branch to set the default security days as 0 for company

4640. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Stefan Rijnhart (Therp)' branch for the fix of journal creation from templates

4641. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4642. By Anup(SerpentCS)

[MERGE] account_budget : Merged RGO's branch for budget line's fix

4643. By Stephane Wirtel (OpenERP)

[FIX] Import __future__

4644. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4645. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Tejas' branch for the fix of copy() of tasks from project and template creation

4646. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4647. By Priyesh (OpenERP)

[MERGE] Merged IRA's branch to remove company name from all translation files

4648. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4649. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4650. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4651. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4652. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4653. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Riken's branch for the fix on report_webkit in case the report template is missing or wrong path is supplied

4654. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4655. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Anup's branch for the fix of webkit report failing to translate report texts

4656. By Jay Vora (Serpent Consulting Services)

[FIX] Hr_Timesheet : Corrected YML test, Thanks to Buildbot

4657. By tfr (Openerp)

[FIX] fix thunderbird on windows vista 7 + fix date format when pushing

4658. By Olivier Dony (Odoo)

[FIX] users_ldap: consistent handling of login() vs check()

Explicit check for blank passwords was introduced recently
in check() for bug 760301, but login() did not behave the same
so the resulting error message would be inconsistent.

4659. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4660. By Anup(SerpentCS)

[MERGE] stock : Merged Valencia's branch for prodlot warning. (Case:6001)

4661. By Anup(SerpentCS)

[MERGE] purchase : Merged Nehal's branch for workflow condition correction which broke Unit Test

4662. By Priyesh (OpenERP)

[MERGE] stock: Merged VRO's branch to make visible Chained location only if Chained Location Type is of type Fixed Location for usability Improvements

4663. By Jay Vora (Serpent Consulting Services)

[FIX] Stock : Correction invoice creation from picking when there are no moves linked

4664. By tfr (Openerp)

[MERGE] Openoffice report designer usability fix

4665. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4666. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4667. By Jay Vora (Serpent Consulting Services)

[FIX] account: opening entries didn't bring forward the amount in currency when closing a fiscalyear. The centralisation had to take care on that too.

4668. By Jay Vora (Serpent Consulting Services)

[Merge]

4669. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4670. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4671. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged the branch for the fix of dashboards' action

4672. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged the branch for the fix of Chained locations: processing first move did not copy prod.lot in chained moves

4673. By Anup(SerpentCS)

[MERGE] account_invoice_layout : Merged Valencia's branch for supplier invoice fixes

4674. By Luc De Meyer (Noviat)

[FIX] Account_payment : Corrected the method which was retuning bank according to the partner

4675. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4676. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4677. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4678. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4679. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4680. By tfr (Openerp)

[FIX] thunderbird packaging

4681. By Anup(SerpentCS)

[MERGE] procurement : Merged Nehal's branch for procurement view's fix

4682. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4683. By tfr (Openerp)

[FIX] backport of bug lp:772724

4684. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4685. By Jay Vora (Serpent Consulting Services)

[FIX] Account : Bank statement now has an internal view

4686. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4687. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4688. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4689. By Anup(SerpentCS)

[MERGE] account_voucher : Merged my branch to import partially paid invoice in the voucher(Case:5625)

4690. By Anup(SerpentCS)

[Merge] l10n_ch : Merged Ravi's branch for Import BVR fix.(Case:6139)

4691. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4692. By tfr (Openerp)

[FIX] bug when subject is empty mailgate

4693. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4694. By Priyesh (OpenERP)

[MERGE] Merged RHA's branch for important changes during partial picking in stock: Improved do_partial method for few improvements and fixes(case:6162)

4695. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Christophe's branch for the fix of check on duplication of documents

4696. By Jay Vora (Serpent Consulting Services)

[FIX] Account_budget : Correction in the calculation of theoritical amount

4697. By Jay Vora (Serpent Consulting Services)

[FIX] Sale/Purchase : Calculation of invoice rates corrected,revert of previous commit http://bazaar.launchpad.net/~openerp/openobject-addons/6.0/revision/4593

4698. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4699. By Jay Vora (Serpent Consulting Services)

[FIX] Account : The wizard for chart of account was sending wrong domain to clients

4700. By Jay Vora (Serpent Consulting Services)

[MERGE] Merges Somesh' branch for the fix of domain on invoiced quantities field of sales order

4701. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4702. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4703. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4704. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4705. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4706. By Jay Vora (Serpent Consulting Services)

[FIX] MRP : Wizard should end with close action

4707. By Jay Vora (Serpent Consulting Services)

Point_of_sale : Corrected the domain on POS orders display and removed wrong view_mode on POS Analysis View

4708. By Stephane Wirtel (OpenERP)

[FIX] hr_timesheet: Remove the comma, because Python thinks it's a tuple and not a new line

4709. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4710. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Priyesh' branch for the fix which manages the accounting configuration for simplified Interface

4711. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4712. By Priyesh (OpenERP)

[MERGE] Merged SKH's branch to fix the format of Email in base_action_rule. Email always has to given in double quotes (). (Case:6122)

4713. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4714. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4715. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4716. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4717. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Valecia's branch for the fix of bad assignation of lot to finished products

4718. By Priyesh (OpenERP)

[MERGE] Merged IRA's branch to fix the 'AttributeError' If pricelist is not present in partner in sale order(case:16233)

4719. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Priyesh' branch for the fix of warning should be displayed when split of lot is done in wrong manner in the context of quantity

4720. By Jay Vora (Serpent Consulting Services)

[MERGE] Merge from Parent branch

4721. By Anup(SerpentCS)

[MERGE] Merged Lorenzo's branch for the fix of Tax Creation of type Balance through chart of accounts

4722. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged Anup's branch for the fix of making some accounting reports translatable

4723. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4724. By Priyesh (OpenERP)

[MERGE] Merged ADO's branch to fix the AttributeError in the absence of Analytic account in Payslip(case:16091)

4725. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4726. By Jay Vora (Serpent Consulting Services)

[FIX] Translation conflicts resolved

4727. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4728. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4729. By Jay Vora (Serpent Consulting Services)

[MERGE] Stock : Correction on splitting moves by setting proper UoS qty.

4730. By Jay Vora (Serpent Consulting Services)

[MERGE] Merged from Parent branch

4731. By Valencia Rodrigues (OpenERP)

[IMP]: account: Improved SXW files of 'Profit And Loss' and 'Balance Sheet' reports based on their respective RML files

Unmerged revisions

4731. By Valencia Rodrigues (OpenERP)

[IMP]: account: Improved SXW files of 'Profit And Loss' and 'Balance Sheet' reports based on their respective RML files

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/account_balance_sheet.py'
2--- account/report/account_balance_sheet.py 2011-06-29 05:29:28 +0000
3+++ account/report/account_balance_sheet.py 2011-07-26 13:28:51 +0000
4@@ -138,6 +138,7 @@
5 'name': account.name,
6 'level': account.level,
7 'balance':account.balance,
8+ 'type':account.type
9 }
10 currency = account.currency_id and account.currency_id or account.company_id.currency_id
11 if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
12@@ -154,11 +155,11 @@
13 accounts_temp.append(account_dict)
14 if account.id == data['form']['reserve_account_id']:
15 pl_dict['level'] = account['level'] + 1
16+ pl_dict['type'] = account.type
17 accounts_temp.append(pl_dict)
18
19 self.result[typ] = accounts_temp
20 cal_list[typ]=self.result[typ]
21-
22 if cal_list:
23 temp = {}
24 for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):
25@@ -168,12 +169,15 @@
26 'name': cal_list['liability'][i]['name'],
27 'level': cal_list['liability'][i]['level'],
28 'balance':cal_list['liability'][i]['balance'],
29+ 'type': cal_list['liability'][i]['type'],
30 'code1': cal_list['asset'][i]['code'],
31 'name1': cal_list['asset'][i]['name'],
32 'level1': cal_list['asset'][i]['level'],
33 'balance1':cal_list['asset'][i]['balance'],
34+ 'type1': cal_list['asset'][i]['type'],
35 }
36 self.result_temp.append(temp)
37+
38 else:
39 if i < len(cal_list['asset']):
40 temp={
41@@ -181,10 +185,12 @@
42 'name': '',
43 'level': False,
44 'balance':False,
45+ 'type': '',
46 'code1': cal_list['asset'][i]['code'],
47 'name1': cal_list['asset'][i]['name'],
48 'level1': cal_list['asset'][i]['level'],
49 'balance1':cal_list['asset'][i]['balance'],
50+ 'type1':cal_list['asset'][i]['type'],
51 }
52 self.result_temp.append(temp)
53 if i < len(cal_list['liability']):
54@@ -193,10 +199,12 @@
55 'name': cal_list['liability'][i]['name'],
56 'level': cal_list['liability'][i]['level'],
57 'balance':cal_list['liability'][i]['balance'],
58+ 'type': cal_list['liability'][i]['type'],
59 'code1': '',
60 'name1': '',
61 'level1': False,
62 'balance1':False,
63+ 'type1': '',
64 }
65 self.result_temp.append(temp)
66 return None
67@@ -215,4 +223,4 @@
68 'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal,
69 header='internal')
70
71-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
72\ No newline at end of file
73+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
74
75=== modified file 'account/report/account_balance_sheet.rml'
76--- account/report/account_balance_sheet.rml 2011-06-29 05:29:28 +0000
77+++ account/report/account_balance_sheet.rml 2011-07-26 13:28:51 +0000
78@@ -209,13 +209,13 @@
79 </tr>
80 <tr>
81 <td>
82- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font></para>
83- </td>
84- <td>
85- <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
86- </td>
87- <td>
88- <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
89+ <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font></para>
90+ </td>
91+ <td>
92+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] [[ a['name'] ]]</font></para>
93+ </td>
94+ <td>
95+ <para style="terp_default_Right_9"><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
96 </td>
97 </tr>
98 </blockTable>
99@@ -254,13 +254,13 @@
100 </tr>
101 <tr>
102 <td>
103- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
104- </td>
105- <td>
106- <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
107- </td>
108- <td>
109- <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font></para>
110+ <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
111+ </td>
112+ <td>
113+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
114+ </td>
115+ <td>
116+ <para style="terp_default_Right_9"><font>[[ (a['type'] == "view" or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
117 </td>
118 </tr>
119 </blockTable>
120
121=== modified file 'account/report/account_balance_sheet.sxw'
122Binary files account/report/account_balance_sheet.sxw 2011-06-29 05:29:28 +0000 and account/report/account_balance_sheet.sxw 2011-07-26 13:28:51 +0000 differ
123=== modified file 'account/report/account_balance_sheet_horizontal.rml'
124--- account/report/account_balance_sheet_horizontal.rml 2011-06-29 05:29:28 +0000
125+++ account/report/account_balance_sheet_horizontal.rml 2011-07-26 13:28:51 +0000
126@@ -197,22 +197,22 @@
127 </tr>
128 <tr>
129 <td>
130- <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code1'] ]]</font></para>
131- </td>
132- <td>
133- <para style="terp_default_9"><font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font></para>
134- </td>
135- <td>
136- <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
137- </td>
138- <td>
139- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
140- </td>
141- <td>
142- <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
143- </td>
144- <td>
145- <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
146+ <para style="terp_default_9"><font>[[ a['type1'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code1'] ]]</font></para>
147+ </td>
148+ <td>
149+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['type1'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font></para>
150+ </td>
151+ <td>
152+ <para style="terp_default_Right_9"><font>[[ a['type1'] == "view" and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
153+ </td>
154+ <td>
155+ <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font> [[ (a['type'] == "view" or a['name']=='Net Profit')and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code'] ]]</font></para>
156+ </td>
157+ <td>
158+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ (a['type'] == "view" or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
159+ </td>
160+ <td>
161+ <para style="terp_default_Right_9"><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
162 <font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font>
163 <font> [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
164 </td>
165
166=== modified file 'account/report/account_balance_sheet_horizontal.sxw'
167Binary files account/report/account_balance_sheet_horizontal.sxw 2011-06-29 05:29:28 +0000 and account/report/account_balance_sheet_horizontal.sxw 2011-07-26 13:28:51 +0000 differ
168=== modified file 'account/report/account_profit_horizontal.rml'
169--- account/report/account_profit_horizontal.rml 2011-06-29 05:29:28 +0000
170+++ account/report/account_profit_horizontal.rml 2011-07-26 13:28:51 +0000
171@@ -213,29 +213,29 @@
172 <td>
173 <para style="terp_default_9">
174
175- <font face="Times-Roman">[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
176- </para>
177- </td>
178- <td>
179- <para style="terp_default_9">
180- <font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font>
181- </para>
182- </td>
183- <td>
184- <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
185- </td>
186- <td>
187- <para style="terp_default_9">
188- [[ a['code1'] ]]<font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
189- </para>
190- </td>
191- <td>
192- <para style="terp_default_9">
193- <font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font>
194- </para>
195- </td>
196- <td>
197- <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
198+ <font face="Times-Roman">[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
199+ </para>
200+ </td>
201+ <td>
202+ <para style="terp_default_9">
203+ <font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font>
204+ </para>
205+ </td>
206+ <td>
207+ <para style="terp_default_Right_9"><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
208+ </td>
209+ <td>
210+ <para style="terp_default_9">
211+ [[ a['code1'] ]]<font>[[ a['type1'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
212+ </para>
213+ </td>
214+ <td>
215+ <para style="terp_default_9">
216+ <font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['type1'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font>
217+ </para>
218+ </td>
219+ <td>
220+ <para style="terp_default_Right_9"><font>[[ a['type1'] == "view" and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
221 </td>
222 </tr>
223 </blockTable>
224
225=== modified file 'account/report/account_profit_horizontal.sxw'
226Binary files account/report/account_profit_horizontal.sxw 2011-06-29 05:29:28 +0000 and account/report/account_profit_horizontal.sxw 2011-07-26 13:28:51 +0000 differ
227=== modified file 'account/report/account_profit_loss.py'
228--- account/report/account_profit_loss.py 2011-06-29 05:29:28 +0000
229+++ account/report/account_profit_loss.py 2011-07-26 13:28:51 +0000
230@@ -139,10 +139,12 @@
231 'name': cal_list['expense'][i].name,
232 'level': cal_list['expense'][i].level,
233 'balance':cal_list['expense'][i].balance,
234+ 'type' : cal_list['expense'][i].type,
235 'code1': cal_list['income'][i].code,
236 'name1': cal_list['income'][i].name,
237 'level1': cal_list['income'][i].level,
238 'balance1':cal_list['income'][i].balance,
239+ 'type1' : cal_list['income'][i].type
240 }
241 self.result_temp.append(temp)
242 else:
243@@ -152,10 +154,13 @@
244 'name': '',
245 'level': False,
246 'balance':False,
247+ 'type': '',
248 'code1': cal_list['income'][i].code,
249 'name1': cal_list['income'][i].name,
250 'level1': cal_list['income'][i].level,
251 'balance1':cal_list['income'][i].balance,
252+ 'type1' : cal_list['income'][i].type
253+
254 }
255 self.result_temp.append(temp)
256 if i < len(cal_list['expense']):
257@@ -164,10 +169,12 @@
258 'name': cal_list['expense'][i].name,
259 'level': cal_list['expense'][i].level,
260 'balance':cal_list['expense'][i].balance,
261+ 'type' : cal_list['expense'][i].type,
262 'code1': '',
263 'name1': '',
264 'level1': False,
265 'balance1':False,
266+ 'type1' : ''
267 }
268 self.result_temp.append(temp)
269 return None
270
271=== modified file 'account/report/account_profit_loss.rml'
272--- account/report/account_profit_loss.rml 2011-06-29 05:29:28 +0000
273+++ account/report/account_profit_loss.rml 2011-07-26 13:28:51 +0000
274@@ -210,16 +210,16 @@
275 <tr>
276 <td>
277 <para style="terp_default_9">
278- <font face="Times-Roman">[[ repeatIn(get_lines_another('expense'),'a' ) ]] </font>[[ a.code ]]<font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
279+ <font face="Times-Roman">[[ repeatIn(get_lines_another('expense'),'a' ) ]] </font>[[ a.code ]]<font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
280 </para>
281 </td>
282 <td>
283 <para style="terp_default_9">
284- <font color="white">[[ '. '*(a.level-1) ]]</font><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a.name ]]</font>
285+ <font color="white">[[ '. '*(a.level-1) ]]</font><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a.name ]]</font>
286 </para>
287 </td>
288 <td>
289- <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
290+ <para style="terp_default_Right_9"><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
291 </td>
292 </tr>
293 </blockTable>
294@@ -265,16 +265,16 @@
295 <tr>
296 <td>
297 <para style="terp_default_9">
298- <font face="Times-Roman">[[ repeatIn(get_lines_another('income'),'a') ]] </font>[[ a.code ]]<font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
299+ <font face="Times-Roman">[[ repeatIn(get_lines_another('income'),'a') ]] </font>[[ a.code ]]<font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
300 </para>
301 </td>
302 <td>
303 <para style="terp_default_9">
304- <font color="white">[[ '. '*(a.level-1) ]]</font><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a.name ]]</font>
305+ <font color="white">[[ '. '*(a.level-1) ]]</font><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a.name ]]</font>
306 </para>
307 </td>
308 <td>
309- <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
310+ <para style="terp_default_Right_9"><font>[[ a['type'] == "view" and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
311 </td>
312 </tr>
313 </blockTable>
314
315=== modified file 'account/report/account_profit_loss.sxw'
316Binary files account/report/account_profit_loss.sxw 2011-06-29 05:29:28 +0000 and account/report/account_profit_loss.sxw 2011-07-26 13:28:51 +0000 differ