Merge lp:~openerp-dev/openobject-addons/7.0-remove-fontnametag-report into lp:openobject-addons/7.0
- 7.0-remove-fontnametag-report
- Merge into 7.0
Proposed by
Chirag Dodiya(OpenERP)
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp:~openerp-dev/openobject-addons/7.0-remove-fontnametag-report |
| Merge into: | lp:openobject-addons/7.0 |
| Diff against target: |
14345 lines (+4666/-5507) 75 files modified
account/project/report/analytic_balance.rml (+93/-93) account/project/report/analytic_journal.rml (+91/-91) account/project/report/cost_ledger.rml (+119/-119) account/project/report/inverted_analytic_balance.rml (+92/-92) account/project/report/quantity_cost_ledger.rml (+106/-106) account/report/account_aged_partner_balance.rml (+83/-105) account/report/account_balance.rml (+58/-76) account/report/account_central_journal.rml (+50/-61) account/report/account_financial_report.rml (+68/-68) account/report/account_general_journal.rml (+69/-78) account/report/account_general_ledger.rml (+180/-191) account/report/account_general_ledger_landscape.rml (+195/-206) account/report/account_journal.rml (+57/-69) account/report/account_journal_sale_purchase.rml (+61/-72) account/report/account_partner_balance.rml (+36/-52) account/report/account_partner_ledger.rml (+167/-167) account/report/account_partner_ledger_other.rml (+156/-168) account/report/account_print_invoice.rml (+0/-9) account/report/account_print_overdue.rml (+67/-78) account/report/account_tax_report.rml (+24/-44) account_analytic_plans/report/crossovered_analytic.rml (+75/-86) account_bank_statement_extensions/report/bank_statement_balance_report.rml (+44/-55) account_budget/report/analytic_account_budget_report.rml (+96/-91) account_budget/report/budget_report.rml (+77/-72) account_budget/report/crossovered_budget_report.rml (+81/-78) account_check_writing/report/check_print.py (+2/-0) account_check_writing/report/check_print_bottom.rml (+51/-72) account_check_writing/report/check_print_middle.rml (+52/-72) account_check_writing/report/check_print_top.rml (+53/-72) account_followup/report/account_followup_print.rml (+36/-47) account_payment/report/order.rml (+68/-79) account_test/report/account_test.rml (+3/-8) account_voucher/report/account_voucher.rml (+48/-79) account_voucher/report/account_voucher_print.rml (+41/-73) delivery/report/shipping.rml (+50/-60) hr_attendance/report/attendance_errors.rml (+42/-53) hr_expense/report/expense.rml (+69/-82) hr_payroll/report/report_contribution_register.rml (+57/-65) hr_payroll/report/report_payslip.rml (+55/-66) hr_payroll/report/report_payslip_details.rml (+72/-93) hr_timesheet_invoice/report/account_analytic_profit.rml (+83/-95) l10n_be/wizard/l10n_be_partner_vat_listing.rml (+50/-62) l10n_be/wizard/l10n_be_vat_intra_print.rml (+28/-28) l10n_fr/report/bilan_report.rml (+69/-78) l10n_fr/report/compute_resultant_report.rml (+54/-63) l10n_fr_hr_payroll/report/fiche_paye.rml (+70/-83) l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml (+100/-111) l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml (+72/-103) l10n_in_hr_payroll/report/report_payroll_advice.rml (+69/-102) l10n_in_hr_payroll/report/report_payslip_details.rml (+55/-75) lunch/report/order.rml (+36/-48) marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml (+2/-6) mrp/report/bom_structure.rml (+54/-66) mrp/report/order.rml (+1/-1) mrp_operations/report/mrp_code_barcode.rml (+2/-12) mrp_operations/report/mrp_wc_barcode.rml (+2/-12) mrp_repair/report/order.rml (+85/-110) point_of_sale/report/account_statement.rml (+58/-69) point_of_sale/report/all_closed_cashbox_of_the_day.rml (+54/-63) point_of_sale/report/pos_details.rml (+91/-102) point_of_sale/report/pos_details_summary.rml (+84/-94) point_of_sale/report/pos_lines.rml (+48/-59) point_of_sale/report/pos_payment_report.rml (+41/-52) point_of_sale/report/pos_payment_report_user.rml (+41/-50) point_of_sale/report/pos_receipt.rml (+30/-41) point_of_sale/report/pos_sales_user.rml (+40/-50) point_of_sale/report/pos_sales_user_today.rml (+40/-50) point_of_sale/report/pos_users_product.rml (+46/-57) product/report/product_pricelist.rml (+72/-103) purchase_requisition/report/purchase_requisition.rml (+57/-69) report_intrastat/report/invoice.rml (+70/-81) stock/report/lot_overview.rml (+56/-67) stock/report/lot_overview_all.rml (+56/-67) stock/report/picking.rml (+65/-76) stock/report/stock_inventory_move.rml (+41/-54) |
| To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/7.0-remove-fontnametag-report |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chirag Dodiya(OpenERP) (community) | Needs Resubmitting | ||
| Rohan Nayani(Open ERP) (community) | Needs Fixing | ||
| OpenERP Core Team | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Hello,
Removed all fontName from addons reports,
kindly review it,
Thanks
Chirag Dodiya
To post a comment you must log in.
Revision history for this message
| Rohan Nayani(Open ERP) (ron-tinyerp) wrote : | # |
review:
Needs Fixing
- 9255. By Chirag Dodiya(OpenERP)
-
[merge]merge with 7.0
- 9256. By Chirag Dodiya(OpenERP)
-
[IMP]Account :account_
print_overdue. rml - 9257. By Chirag Dodiya(OpenERP)
-
[IMP]Account :account_
tax_report. rml - 9258. By Chirag Dodiya(OpenERP)
-
[IMP]account_budjet :analytic_
account_ budget_ report. rml, budget_report.rml, crossovered_ budget_ report. rml - 9259. By Chirag Dodiya(OpenERP)
-
[IMP]Removed extra parastyle from all addons report
- 9260. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
- 9261. By Chirag Dodiya(OpenERP)
-
[IMP]account_
budget: analytic_ account_ budget_ report. rml,budget_ report. rml,crossovered _budget_ report. rml - 9262. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
Revision history for this message
| Chirag Dodiya(OpenERP) (chirag.dodiya-openerp) wrote : | # |
Hello sir,
I have done the changes as per your suggestion.
Thanks,
Chirag Dodiya
review:
Needs Resubmitting
Revision history for this message
| Rohan Nayani(Open ERP) (ron-tinyerp) wrote : | # |
chirag,
seems ok but need some minor improvement,
i can see setTag(
Also remove <Enter> key press on Credit label in account_
Thanks
- 9263. By Chirag Dodiya(OpenERP)
-
[IMP]Account:
account_ partner_ ledger. rml Improved as per review suggestion - 9264. By Chirag Dodiya(OpenERP)
-
[IMP]Account:
account_ balance. rml,account_ partner_ balance. rml Improved as per review suggestion - 9265. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
- 9266. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
- 9267. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
- 9268. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with lp:openobject-addons/7.0
Unmerged revisions
- 9268. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with lp:openobject-addons/7.0
- 9267. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
- 9266. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
- 9265. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
- 9264. By Chirag Dodiya(OpenERP)
-
[IMP]Account:
account_ balance. rml,account_ partner_ balance. rml Improved as per review suggestion - 9263. By Chirag Dodiya(OpenERP)
-
[IMP]Account:
account_ partner_ ledger. rml Improved as per review suggestion - 9262. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
- 9261. By Chirag Dodiya(OpenERP)
-
[IMP]account_
budget: analytic_ account_ budget_ report. rml,budget_ report. rml,crossovered _budget_ report. rml - 9260. By Chirag Dodiya(OpenERP)
-
[MERGE] merge with addons 7.0
- 9259. By Chirag Dodiya(OpenERP)
-
[IMP]Removed extra parastyle from all addons report
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'account/project/report/analytic_balance.rml' | |||
| 2 | --- account/project/report/analytic_balance.rml 2012-11-29 22:26:45 +0000 | |||
| 3 | +++ account/project/report/analytic_balance.rml 2013-08-13 05:40:59 +0000 | |||
| 4 | @@ -53,38 +53,38 @@ | |||
| 5 | 53 | <initialize> | 53 | <initialize> |
| 6 | 54 | <paraStyle name="all" alignment="justify"/> | 54 | <paraStyle name="all" alignment="justify"/> |
| 7 | 55 | </initialize> | 55 | </initialize> |
| 40 | 56 | <paraStyle name="Standard" fontName="Helvetica"/> | 56 | <paraStyle name="Standard"/> |
| 41 | 57 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 57 | <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/> |
| 42 | 58 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 58 | <paraStyle name="List" spaceBefore="0.0" spaceAfter="6.0"/> |
| 43 | 59 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/> | 59 | <paraStyle name="Table Contents" spaceBefore="0.0" spaceAfter="0.0"/> |
| 44 | 60 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 60 | <paraStyle name="Table Heading" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 45 | 61 | <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 61 | <paraStyle name="Caption" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> |
| 46 | 62 | <paraStyle name="Index" fontName="Helvetica"/> | 62 | <paraStyle name="Index" /> |
| 47 | 63 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 63 | <paraStyle name="Heading" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> |
| 48 | 64 | <paraStyle name="Footer" fontName="Helvetica"/> | 64 | <paraStyle name="Footer" /> |
| 49 | 65 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 65 | <paraStyle name="Horizontal Line" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> |
| 50 | 66 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 66 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 51 | 67 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 67 | <paraStyle name="Heading 9" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> |
| 52 | 68 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 68 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 53 | 69 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 69 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 54 | 70 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 70 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 55 | 71 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 71 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 56 | 72 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 72 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 57 | 73 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 73 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 58 | 74 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 74 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 59 | 75 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 75 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 60 | 76 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 76 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 61 | 77 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 77 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 62 | 78 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 78 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 63 | 79 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 79 | <paraStyle name="terp_header_Centre" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 64 | 80 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 80 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 65 | 81 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 81 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 66 | 82 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 82 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 67 | 83 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 83 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 68 | 84 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 84 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 69 | 85 | <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/> | 85 | <paraStyle name="terp_default_space" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/> |
| 70 | 86 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 86 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 71 | 87 | <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 87 | <paraStyle name="terp_default_Right_9_Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 72 | 88 | <images/> | 88 | <images/> |
| 73 | 89 | </stylesheet> | 89 | </stylesheet> |
| 74 | 90 | <story> | 90 | <story> |
| 75 | @@ -93,22 +93,22 @@ | |||
| 76 | 93 | <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile"> | 93 | <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile"> |
| 77 | 94 | <tr> | 94 | <tr> |
| 78 | 95 | <td> | 95 | <td> |
| 95 | 96 | <para style="terp_tblheader_Details">Code</para> | 96 | <para style="terp_tblheader_Details"><b>Code</b></para> |
| 96 | 97 | </td> | 97 | </td> |
| 97 | 98 | <td> | 98 | <td> |
| 98 | 99 | <para style="terp_tblheader_Details">Account Name</para> | 99 | <para style="terp_tblheader_Details"><b>Account Name</b></para> |
| 99 | 100 | </td> | 100 | </td> |
| 100 | 101 | <td> | 101 | <td> |
| 101 | 102 | <para style="terp_tblheader_Details_Right">Debit</para> | 102 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 102 | 103 | </td> | 103 | </td> |
| 103 | 104 | <td> | 104 | <td> |
| 104 | 105 | <para style="terp_tblheader_Details_Right">Credit</para> | 105 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 105 | 106 | </td> | 106 | </td> |
| 106 | 107 | <td> | 107 | <td> |
| 107 | 108 | <para style="terp_tblheader_Details_Right">Balance</para> | 108 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 108 | 109 | </td> | 109 | </td> |
| 109 | 110 | <td> | 110 | <td> |
| 110 | 111 | <para style="terp_tblheader_Details_Right">Quantity</para> | 111 | <para style="terp_tblheader_Details_Right"><b>Quantity</b></para> |
| 111 | 112 | </td> | 112 | </td> |
| 112 | 113 | </tr> | 113 | </tr> |
| 113 | 114 | </blockTable> | 114 | </blockTable> |
| 114 | @@ -117,7 +117,7 @@ | |||
| 115 | 117 | <blockTable colWidths="532.0" style="Table_Header_analytic"> | 117 | <blockTable colWidths="532.0" style="Table_Header_analytic"> |
| 116 | 118 | <tr> | 118 | <tr> |
| 117 | 119 | <td> | 119 | <td> |
| 119 | 120 | <para style="terp_header_Centre">Analytic Balance - [[ company.currency_id.name ]]</para> | 120 | <para style="terp_header_Centre"><b>Analytic Balance - [[ company.currency_id.name ]]</b></para> |
| 120 | 121 | </td> | 121 | </td> |
| 121 | 122 | </tr> | 122 | </tr> |
| 122 | 123 | </blockTable> | 123 | </blockTable> |
| 123 | @@ -127,29 +127,29 @@ | |||
| 124 | 127 | <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile"> | 127 | <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile"> |
| 125 | 128 | <tr> | 128 | <tr> |
| 126 | 129 | <td> | 129 | <td> |
| 143 | 130 | <para style="terp_tblheader_Details">Code</para> | 130 | <para style="terp_tblheader_Details"><b>Code</b></para> |
| 144 | 131 | </td> | 131 | </td> |
| 145 | 132 | <td> | 132 | <td> |
| 146 | 133 | <para style="terp_tblheader_Details">Account Name</para> | 133 | <para style="terp_tblheader_Details"><b>Account Name</b></para> |
| 147 | 134 | </td> | 134 | </td> |
| 148 | 135 | <td> | 135 | <td> |
| 149 | 136 | <para style="terp_tblheader_Details_Right">Debit</para> | 136 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 150 | 137 | </td> | 137 | </td> |
| 151 | 138 | <td> | 138 | <td> |
| 152 | 139 | <para style="terp_tblheader_Details_Right">Credit</para> | 139 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 153 | 140 | </td> | 140 | </td> |
| 154 | 141 | <td> | 141 | <td> |
| 155 | 142 | <para style="terp_tblheader_Details_Right">Balance</para> | 142 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 156 | 143 | </td> | 143 | </td> |
| 157 | 144 | <td> | 144 | <td> |
| 158 | 145 | <para style="terp_tblheader_Details_Right">Quantity</para> | 145 | <para style="terp_tblheader_Details_Right"><b>Quantity</b></para> |
| 159 | 146 | </td> | 146 | </td> |
| 160 | 147 | </tr> | 147 | </tr> |
| 161 | 148 | </blockTable> | 148 | </blockTable> |
| 162 | 149 | <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table1"> | 149 | <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table1"> |
| 163 | 150 | <tr> | 150 | <tr> |
| 164 | 151 | <td> | 151 | <td> |
| 166 | 152 | <para style="terp_tblheader_Details">Total</para> | 152 | <para style="terp_tblheader_Details"><b>Total</b></para> |
| 167 | 153 | </td> | 153 | </td> |
| 168 | 154 | <td> | 154 | <td> |
| 169 | 155 | <para style="terp_tblheader_Details"> | 155 | <para style="terp_tblheader_Details"> |
| 170 | @@ -157,16 +157,16 @@ | |||
| 171 | 157 | </para> | 157 | </para> |
| 172 | 158 | </td> | 158 | </td> |
| 173 | 159 | <td> | 159 | <td> |
| 184 | 160 | <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]] </para> | 160 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]]</b> </para> |
| 185 | 161 | </td> | 161 | </td> |
| 186 | 162 | <td> | 162 | <td> |
| 187 | 163 | <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] </para> | 163 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]]</b> </para> |
| 188 | 164 | </td> | 164 | </td> |
| 189 | 165 | <td> | 165 | <td> |
| 190 | 166 | <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para> | 166 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</b></para> |
| 191 | 167 | </td> | 167 | </td> |
| 192 | 168 | <td> | 168 | <td> |
| 193 | 169 | <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</para> | 169 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</b></para> |
| 194 | 170 | </td> | 170 | </td> |
| 195 | 171 | </tr> | 171 | </tr> |
| 196 | 172 | </blockTable> | 172 | </blockTable> |
| 197 | @@ -175,22 +175,22 @@ | |||
| 198 | 175 | <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table2"> | 175 | <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table2"> |
| 199 | 176 | <tr> | 176 | <tr> |
| 200 | 177 | <td> | 177 | <td> |
| 217 | 178 | <para style="terp_default_Bold_9">[[ o['code'] ]]</para> | 178 | <para style="terp_default_Bold_9"><b>[[ o['code'] ]]</b></para> |
| 218 | 179 | </td> | 179 | </td> |
| 219 | 180 | <td> | 180 | <td> |
| 220 | 181 | <para style="terp_default_Bold_9">[[ o['complete_name'] ]]</para> | 181 | <para style="terp_default_Bold_9"><b>[[ o['complete_name'] ]]</b></para> |
| 221 | 182 | </td> | 182 | </td> |
| 222 | 183 | <td> | 183 | <td> |
| 223 | 184 | <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]] </para> | 184 | <para style="terp_default_Right_9_Bold"><b>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]]</b> </para> |
| 224 | 185 | </td> | 185 | </td> |
| 225 | 186 | <td> | 186 | <td> |
| 226 | 187 | <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </para> | 187 | <para style="terp_default_Right_9_Bold"><b>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </b> </para> |
| 227 | 188 | </td> | 188 | </td> |
| 228 | 189 | <td> | 189 | <td> |
| 229 | 190 | <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para> | 190 | <para style="terp_default_Right_9_Bold"><b>[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</b></para> |
| 230 | 191 | </td> | 191 | </td> |
| 231 | 192 | <td> | 192 | <td> |
| 232 | 193 | <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</para> | 193 | <para style="terp_default_Right_9_Bold"><b>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</b></para> |
| 233 | 194 | </td> | 194 | </td> |
| 234 | 195 | </tr> | 195 | </tr> |
| 235 | 196 | </blockTable> | 196 | </blockTable> |
| 236 | @@ -231,4 +231,4 @@ | |||
| 237 | 231 | </para> | 231 | </para> |
| 238 | 232 | </pto> | 232 | </pto> |
| 239 | 233 | </story> | 233 | </story> |
| 240 | 234 | </document> | ||
| 241 | 235 | \ No newline at end of file | 234 | \ No newline at end of file |
| 242 | 235 | </document> | ||
| 243 | 236 | 236 | ||
| 244 | === modified file 'account/project/report/analytic_journal.rml' | |||
| 245 | --- account/project/report/analytic_journal.rml 2011-12-21 09:08:11 +0000 | |||
| 246 | +++ account/project/report/analytic_journal.rml 2013-08-13 05:40:59 +0000 | |||
| 247 | @@ -95,51 +95,51 @@ | |||
| 248 | 95 | <initialize> | 95 | <initialize> |
| 249 | 96 | <paraStyle name="all" alignment="justify"/> | 96 | <paraStyle name="all" alignment="justify"/> |
| 250 | 97 | </initialize> | 97 | </initialize> |
| 296 | 98 | <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 98 | <paraStyle name="P1" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 297 | 99 | <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 99 | <paraStyle name="P2" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 298 | 100 | <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 100 | <paraStyle name="P3" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 299 | 101 | <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="0.0"/> | 101 | <paraStyle name="P4" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="0.0"/> |
| 300 | 102 | <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 102 | <paraStyle name="P5" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 301 | 103 | <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 103 | <paraStyle name="P6" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 302 | 104 | <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 104 | <paraStyle name="P7" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 303 | 105 | <paraStyle name="P8" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 105 | <paraStyle name="P8" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 304 | 106 | <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 106 | <paraStyle name="P9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 305 | 107 | <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 107 | <paraStyle name="P10" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 306 | 108 | <paraStyle name="P11" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 108 | <paraStyle name="P11" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 307 | 109 | <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 109 | <paraStyle name="P12" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 308 | 110 | <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 110 | <paraStyle name="P13" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 309 | 111 | <paraStyle name="Standard" fontName="Helvetica"/> | 111 | <paraStyle name="Standard" /> |
| 310 | 112 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 112 | <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/> |
| 311 | 113 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 113 | <paraStyle name="Heading" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> |
| 312 | 114 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 114 | <paraStyle name="List" spaceBefore="0.0" spaceAfter="6.0"/> |
| 313 | 115 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/> | 115 | <paraStyle name="Table Contents" spaceBefore="0.0" spaceAfter="0.0"/> |
| 314 | 116 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 116 | <paraStyle name="Table Heading" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 315 | 117 | <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> | 117 | <paraStyle name="Caption" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> |
| 316 | 118 | <paraStyle name="Index" fontName="Helvetica"/> | 118 | <paraStyle name="Index" /> |
| 317 | 119 | <paraStyle name="Footer" fontName="Helvetica"/> | 119 | <paraStyle name="Footer" /> |
| 318 | 120 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 120 | <paraStyle name="Horizontal Line" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> |
| 319 | 121 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 121 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 320 | 122 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 122 | <paraStyle name="Heading 9" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> |
| 321 | 123 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 123 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 322 | 124 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 124 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 323 | 125 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 125 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 324 | 126 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 126 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 325 | 127 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 127 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 326 | 128 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 128 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 327 | 129 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 129 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 328 | 130 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 130 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 329 | 131 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 131 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 330 | 132 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 132 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 331 | 133 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 133 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 332 | 134 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 134 | <paraStyle name="terp_header_Centre" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 333 | 135 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 135 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 334 | 136 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 136 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 335 | 137 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 137 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 336 | 138 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 138 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 337 | 139 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 139 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 338 | 140 | <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="11.0" spaceAfter="0.0"/> | 140 | <paraStyle name="terp_default_space" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="11.0" spaceAfter="0.0"/> |
| 339 | 141 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 141 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 340 | 142 | <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 142 | <paraStyle name="terp_default_Right_9_Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 341 | 143 | </stylesheet> | 143 | </stylesheet> |
| 342 | 144 | <images/> | 144 | <images/> |
| 343 | 145 | <story> | 145 | <story> |
| 344 | @@ -147,20 +147,20 @@ | |||
| 345 | 147 | <para style="terp_default_8"> | 147 | <para style="terp_default_8"> |
| 346 | 148 | <font color="white"> </font> | 148 | <font color="white"> </font> |
| 347 | 149 | </para> | 149 | </para> |
| 349 | 150 | <para style="terp_header_Centre">Analytic Journal</para> | 150 | <para style="terp_header_Centre"><b>Analytic Journal</b></para> |
| 350 | 151 | <para style="terp_default_8"> | 151 | <para style="terp_default_8"> |
| 351 | 152 | <font color="white"> </font> | 152 | <font color="white"> </font> |
| 352 | 153 | </para> | 153 | </para> |
| 353 | 154 | <blockTable colWidths="180.0,180.0,180.0" style="Table5"> | 154 | <blockTable colWidths="180.0,180.0,180.0" style="Table5"> |
| 354 | 155 | <tr> | 155 | <tr> |
| 355 | 156 | <td> | 156 | <td> |
| 363 | 157 | <para style="terp_tblheader_Details_Centre">Period from</para> | 157 | <para style="terp_tblheader_Details_Centre"><b>Period from</b></para> |
| 364 | 158 | </td> | 158 | </td> |
| 365 | 159 | <td> | 159 | <td> |
| 366 | 160 | <para style="terp_tblheader_Details_Centre">Period to</para> | 160 | <para style="terp_tblheader_Details_Centre"><b>Period to</b></para> |
| 367 | 161 | </td> | 161 | </td> |
| 368 | 162 | <td> | 162 | <td> |
| 369 | 163 | <para style="terp_tblheader_Details_Centre">Currency</para> | 163 | <para style="terp_tblheader_Details_Centre"><b>Currency</b></para> |
| 370 | 164 | </td> | 164 | </td> |
| 371 | 165 | </tr> | 165 | </tr> |
| 372 | 166 | </blockTable> | 166 | </blockTable> |
| 373 | @@ -183,22 +183,22 @@ | |||
| 374 | 183 | <blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table_detail_header"> | 183 | <blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table_detail_header"> |
| 375 | 184 | <tr> | 184 | <tr> |
| 376 | 185 | <td> | 185 | <td> |
| 393 | 186 | <para style="terp_tblheader_Details">Date</para> | 186 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 394 | 187 | </td> | 187 | </td> |
| 395 | 188 | <td> | 188 | <td> |
| 396 | 189 | <para style="terp_tblheader_Details">Code</para> | 189 | <para style="terp_tblheader_Details"><b>Code</b></para> |
| 397 | 190 | </td> | 190 | </td> |
| 398 | 191 | <td> | 191 | <td> |
| 399 | 192 | <para style="terp_tblheader_Details">Move Name</para> | 192 | <para style="terp_tblheader_Details"><b>Move Name</b></para> |
| 400 | 193 | </td> | 193 | </td> |
| 401 | 194 | <td> | 194 | <td> |
| 402 | 195 | <para style="terp_tblheader_Details">Account n°</para> | 195 | <para style="terp_tblheader_Details"><b>Account n°</b></para> |
| 403 | 196 | </td> | 196 | </td> |
| 404 | 197 | <td> | 197 | <td> |
| 405 | 198 | <para style="terp_tblheader_Details_Right">General</para> | 198 | <para style="terp_tblheader_Details_Right"><b>General</b></para> |
| 406 | 199 | </td> | 199 | </td> |
| 407 | 200 | <td> | 200 | <td> |
| 408 | 201 | <para style="terp_tblheader_Details_Right">Analytic</para> | 201 | <para style="terp_tblheader_Details_Right"><b>Analytic</b></para> |
| 409 | 202 | </td> | 202 | </td> |
| 410 | 203 | </tr> | 203 | </tr> |
| 411 | 204 | </blockTable> | 204 | </blockTable> |
| 412 | @@ -208,28 +208,28 @@ | |||
| 413 | 208 | <blockTable colWidths="118.0,28.0,168.0,73.0,74.0,77.0" style="Table1"> | 208 | <blockTable colWidths="118.0,28.0,168.0,73.0,74.0,77.0" style="Table1"> |
| 414 | 209 | <tr> | 209 | <tr> |
| 415 | 210 | <td> | 210 | <td> |
| 438 | 211 | <para style="terp_tblheader_Details">[[ o.code ]] - [[ o.name ]]</para> | 211 | <para style="terp_tblheader_Details"><b>[[ o.code ]] - [[ o.name ]]</b></para> |
| 439 | 212 | </td> | 212 | </td> |
| 440 | 213 | <td> | 213 | <td> |
| 441 | 214 | <para style="terp_tblheader_Details"> | 214 | <para style="terp_tblheader_Details"> |
| 442 | 215 | <font color="white"> </font> | 215 | <font color="white"> </font> |
| 443 | 216 | </para> | 216 | </para> |
| 444 | 217 | </td> | 217 | </td> |
| 445 | 218 | <td> | 218 | <td> |
| 446 | 219 | <para style="terp_tblheader_Details"> | 219 | <para style="terp_tblheader_Details"> |
| 447 | 220 | <font color="white"> </font> | 220 | <font color="white"> </font> |
| 448 | 221 | </para> | 221 | </para> |
| 449 | 222 | </td> | 222 | </td> |
| 450 | 223 | <td> | 223 | <td> |
| 451 | 224 | <para style="terp_tblheader_Details"> | 224 | <para style="terp_tblheader_Details"> |
| 452 | 225 | <font color="white"> </font> | 225 | <font color="white"> </font> |
| 453 | 226 | </para> | 226 | </para> |
| 454 | 227 | </td> | 227 | </td> |
| 455 | 228 | <td> | 228 | <td> |
| 456 | 229 | <para style="terp_default_Right_9_Bold">[[ formatLang(sum_general(o.id,data['form']['date1'],data['form']['date2'])) ]]</para> | 229 | <para style="terp_default_Right_9_Bold"><b>[[ formatLang(sum_general(o.id,data['form']['date1'],data['form']['date2'])) ]]</b></para> |
| 457 | 230 | </td> | 230 | </td> |
| 458 | 231 | <td> | 231 | <td> |
| 459 | 232 | <para style="terp_default_Right_9_Bold">[[ formatLang(sum_analytic(o.id,data['form']['date1'],data['form']['date2'])) ]]</para> | 232 | <para style="terp_default_Right_9_Bold"><b>[[ formatLang(sum_analytic(o.id,data['form']['date1'],data['form']['date2'])) ]]</b></para> |
| 460 | 233 | </td> | 233 | </td> |
| 461 | 234 | </tr> | 234 | </tr> |
| 462 | 235 | </blockTable> | 235 | </blockTable> |
| 463 | 236 | 236 | ||
| 464 | === modified file 'account/project/report/cost_ledger.rml' | |||
| 465 | --- account/project/report/cost_ledger.rml 2012-11-29 22:26:45 +0000 | |||
| 466 | +++ account/project/report/cost_ledger.rml 2013-08-13 05:40:59 +0000 | |||
| 467 | @@ -82,41 +82,41 @@ | |||
| 468 | 82 | <initialize> | 82 | <initialize> |
| 469 | 83 | <paraStyle name="all" alignment="justify"/> | 83 | <paraStyle name="all" alignment="justify"/> |
| 470 | 84 | </initialize> | 84 | </initialize> |
| 506 | 85 | <paraStyle name="Standard" fontName="Helvetica"/> | 85 | <paraStyle name="Standard" /> |
| 507 | 86 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 86 | <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/> |
| 508 | 87 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 87 | <paraStyle name="List" spaceBefore="0.0" spaceAfter="6.0"/> |
| 509 | 88 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/> | 88 | <paraStyle name="Table Contents" spaceBefore="0.0" spaceAfter="0.0"/> |
| 510 | 89 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 89 | <paraStyle name="Table Heading" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 511 | 90 | <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 90 | <paraStyle name="Caption" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> |
| 512 | 91 | <paraStyle name="Index" fontName="Helvetica"/> | 91 | <paraStyle name="Index" /> |
| 513 | 92 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 92 | <paraStyle name="Heading" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> |
| 514 | 93 | <paraStyle name="Footer" fontName="Helvetica"/> | 93 | <paraStyle name="Footer" /> |
| 515 | 94 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 94 | <paraStyle name="Horizontal Line" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> |
| 516 | 95 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 95 | <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 517 | 96 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 96 | <paraStyle name="Heading 9" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> |
| 518 | 97 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 97 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 519 | 98 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 98 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 520 | 99 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 99 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 521 | 100 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 100 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 522 | 101 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 101 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 523 | 102 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 102 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 524 | 103 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 103 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 525 | 104 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 104 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 526 | 105 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 105 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 527 | 106 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 106 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 528 | 107 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/> | 107 | <paraStyle name="terp_header_Right" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 529 | 108 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | 108 | <paraStyle name="terp_header_Centre" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 530 | 109 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 109 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 531 | 110 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 110 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 532 | 111 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 111 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 533 | 112 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 112 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 534 | 113 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 113 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 535 | 114 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 114 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 536 | 115 | <paraStyle name="terp_Default_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 115 | <paraStyle name="terp_Default_Bold_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 537 | 116 | <paraStyle name="terp_Default_Bold_Right_9_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 116 | <paraStyle name="terp_Default_Bold_Right_9_U" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 538 | 117 | <paraStyle name="terp_Default_Right_9_U" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 117 | <paraStyle name="terp_Default_Right_9_U" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 539 | 118 | <paraStyle name="terp_default_9_Italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 118 | <paraStyle name="terp_default_9_Italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 540 | 119 | <paraStyle name="terp_default_9_italic_Rignt" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 119 | <paraStyle name="terp_default_9_italic_Rignt" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 541 | 120 | <images/> | 120 | <images/> |
| 542 | 121 | </stylesheet> | 121 | </stylesheet> |
| 543 | 122 | <story> | 122 | <story> |
| 544 | @@ -125,19 +125,19 @@ | |||
| 545 | 125 | <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title"> | 125 | <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title"> |
| 546 | 126 | <tr> | 126 | <tr> |
| 547 | 127 | <td> | 127 | <td> |
| 561 | 128 | <para style="terp_tblheader_Details">Date/Code</para> | 128 | <para style="terp_tblheader_Details"><b>Date/Code</b></para> |
| 562 | 129 | </td> | 129 | </td> |
| 563 | 130 | <td> | 130 | <td> |
| 564 | 131 | <para style="terp_tblheader_Details">J.C. /Move name</para> | 131 | <para style="terp_tblheader_Details"><b>J.C. /Move name</b></para> |
| 565 | 132 | </td> | 132 | </td> |
| 566 | 133 | <td> | 133 | <td> |
| 567 | 134 | <para style="terp_tblheader_Details_Right">Debit</para> | 134 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 568 | 135 | </td> | 135 | </td> |
| 569 | 136 | <td> | 136 | <td> |
| 570 | 137 | <para style="terp_tblheader_Details_Right">Credit</para> | 137 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 571 | 138 | </td> | 138 | </td> |
| 572 | 139 | <td> | 139 | <td> |
| 573 | 140 | <para style="terp_tblheader_Details_Right">Balance</para> | 140 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 574 | 141 | </td> | 141 | </td> |
| 575 | 142 | </tr> | 142 | </tr> |
| 576 | 143 | </blockTable> | 143 | </blockTable> |
| 577 | @@ -150,7 +150,7 @@ | |||
| 578 | 150 | </para> | 150 | </para> |
| 579 | 151 | </td> | 151 | </td> |
| 580 | 152 | <td> | 152 | <td> |
| 582 | 153 | <para style="terp_header_Centre">Cost Ledger</para> | 153 | <para style="terp_header_Centre"><b>Cost Ledger</b></para> |
| 583 | 154 | </td> | 154 | </td> |
| 584 | 155 | <td> | 155 | <td> |
| 585 | 156 | <para style="terp_header_Right"> | 156 | <para style="terp_header_Right"> |
| 586 | @@ -162,13 +162,13 @@ | |||
| 587 | 162 | <blockTable colWidths="179.0,179.0,179.0" style="Table_Date_Sub_detail"> | 162 | <blockTable colWidths="179.0,179.0,179.0" style="Table_Date_Sub_detail"> |
| 588 | 163 | <tr> | 163 | <tr> |
| 589 | 164 | <td> | 164 | <td> |
| 597 | 165 | <para style="terp_tblheader_General_Centre">Period from </para> | 165 | <para style="terp_tblheader_General_Centre"><b>Period from</b></para> |
| 598 | 166 | </td> | 166 | </td> |
| 599 | 167 | <td> | 167 | <td> |
| 600 | 168 | <para style="terp_tblheader_General_Centre">Period to</para> | 168 | <para style="terp_tblheader_General_Centre"><b>Period to</b></para> |
| 601 | 169 | </td> | 169 | </td> |
| 602 | 170 | <td> | 170 | <td> |
| 603 | 171 | <para style="terp_tblheader_General_Centre">Printing date</para> | 171 | <para style="terp_tblheader_General_Centre"><b>Printing date</b></para> |
| 604 | 172 | </td> | 172 | </td> |
| 605 | 173 | </tr> | 173 | </tr> |
| 606 | 174 | </blockTable> | 174 | </blockTable> |
| 607 | @@ -191,26 +191,26 @@ | |||
| 608 | 191 | <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title"> | 191 | <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title"> |
| 609 | 192 | <tr> | 192 | <tr> |
| 610 | 193 | <td> | 193 | <td> |
| 624 | 194 | <para style="terp_tblheader_Details">Date/Code</para> | 194 | <para style="terp_tblheader_Details"><b>Date/Code</b></para> |
| 625 | 195 | </td> | 195 | </td> |
| 626 | 196 | <td> | 196 | <td> |
| 627 | 197 | <para style="terp_tblheader_Details">J.C. /Move name</para> | 197 | <para style="terp_tblheader_Details"><b>J.C. /Move name</b></para> |
| 628 | 198 | </td> | 198 | </td> |
| 629 | 199 | <td> | 199 | <td> |
| 630 | 200 | <para style="terp_tblheader_Details_Right">Debit</para> | 200 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 631 | 201 | </td> | 201 | </td> |
| 632 | 202 | <td> | 202 | <td> |
| 633 | 203 | <para style="terp_tblheader_Details_Right">Credit</para> | 203 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 634 | 204 | </td> | 204 | </td> |
| 635 | 205 | <td> | 205 | <td> |
| 636 | 206 | <para style="terp_tblheader_Details_Right">Balance</para> | 206 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 637 | 207 | </td> | 207 | </td> |
| 638 | 208 | </tr> | 208 | </tr> |
| 639 | 209 | </blockTable> | 209 | </blockTable> |
| 640 | 210 | <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Grant_Total"> | 210 | <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Grant_Total"> |
| 641 | 211 | <tr> | 211 | <tr> |
| 642 | 212 | <td> | 212 | <td> |
| 644 | 213 | <para style="terp_default_Bold_9">Total:</para> | 213 | <para style="terp_default_Bold_9"><b>Total:</b></para> |
| 645 | 214 | </td> | 214 | </td> |
| 646 | 215 | <td> | 215 | <td> |
| 647 | 216 | <para style="terp_default_Bold_9"> | 216 | <para style="terp_default_Bold_9"> |
| 648 | @@ -218,13 +218,13 @@ | |||
| 649 | 218 | </para> | 218 | </para> |
| 650 | 219 | </td> | 219 | </td> |
| 651 | 220 | <td> | 220 | <td> |
| 659 | 221 | <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] </para> | 221 | <para style="terp_Default_Bold_Right_9_U"><b>[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</b> </para> |
| 660 | 222 | </td> | 222 | </td> |
| 661 | 223 | <td> | 223 | <td> |
| 662 | 224 | <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para> | 224 | <para style="terp_Default_Bold_Right_9_U"><b>[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </b></para> |
| 663 | 225 | </td> | 225 | </td> |
| 664 | 226 | <td> | 226 | <td> |
| 665 | 227 | <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para> | 227 | <para style="terp_Default_Bold_Right_9_U"><b>[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</b></para> |
| 666 | 228 | </td> | 228 | </td> |
| 667 | 229 | </tr> | 229 | </tr> |
| 668 | 230 | </blockTable> | 230 | </blockTable> |
| 669 | @@ -233,19 +233,19 @@ | |||
| 670 | 233 | <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Account_Detail"> | 233 | <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Account_Detail"> |
| 671 | 234 | <tr> | 234 | <tr> |
| 672 | 235 | <td> | 235 | <td> |
| 686 | 236 | <para style="terp_default_Bold_9">[[ account.code ]]</para> | 236 | <para style="terp_default_Bold_9"><b>[[ account.code ]]</b></para> |
| 687 | 237 | </td> | 237 | </td> |
| 688 | 238 | <td> | 238 | <td> |
| 689 | 239 | <para style="terp_default_Bold_9">[[ account.complete_name ]]</para> | 239 | <para style="terp_default_Bold_9"><b>[[ account.complete_name ]]</b></para> |
| 690 | 240 | </td> | 240 | </td> |
| 691 | 241 | <td> | 241 | <td> |
| 692 | 242 | <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(account,data['form']['date1'],data['form']['date2'])) ]] </para> | 242 | <para style="terp_Default_Bold_Right_9_U"><b>[[ formatLang (account_sum_debit(account,data['form']['date1'],data['form']['date2'])) ]]</b> </para> |
| 693 | 243 | </td> | 243 | </td> |
| 694 | 244 | <td> | 244 | <td> |
| 695 | 245 | <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]] </para> | 245 | <para style="terp_Default_Bold_Right_9_U"><b>[[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]] </b></para> |
| 696 | 246 | </td> | 246 | </td> |
| 697 | 247 | <td> | 247 | <td> |
| 698 | 248 | <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para> | 248 | <para style="terp_Default_Bold_Right_9_U"><b>[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</b></para> |
| 699 | 249 | </td> | 249 | </td> |
| 700 | 250 | </tr> | 250 | </tr> |
| 701 | 251 | </blockTable> | 251 | </blockTable> |
| 702 | @@ -254,19 +254,19 @@ | |||
| 703 | 254 | <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Move_Line_Detail"> | 254 | <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Move_Line_Detail"> |
| 704 | 255 | <tr> | 255 | <tr> |
| 705 | 256 | <td> | 256 | <td> |
| 719 | 257 | <para style="terp_default_Bold_9">[[ move_g['code'] ]]</para> | 257 | <para style="terp_default_Bold_9"><b>[[ move_g['code'] ]]</b></para> |
| 720 | 258 | </td> | 258 | </td> |
| 721 | 259 | <td> | 259 | <td> |
| 722 | 260 | <para style="terp_default_Bold_9">[[ move_g['name'] ]]</para> | 260 | <para style="terp_default_Bold_9"><b>[[ move_g['name'] ]]</b></para> |
| 723 | 261 | </td> | 261 | </td> |
| 724 | 262 | <td> | 262 | <td> |
| 725 | 263 | <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]] </para> | 263 | <para style="terp_Default_Bold_Right_9_U"><b>[[ formatLang( move_g['debit']) ]]</b> </para> |
| 726 | 264 | </td> | 264 | </td> |
| 727 | 265 | <td> | 265 | <td> |
| 728 | 266 | <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para> | 266 | <para style="terp_Default_Bold_Right_9_U"><b>[[ formatLang( move_g['credit']) ]]</b> </para> |
| 729 | 267 | </td> | 267 | </td> |
| 730 | 268 | <td> | 268 | <td> |
| 731 | 269 | <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]]</para> | 269 | <para style="terp_Default_Bold_Right_9_U"><b>[[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]]</b></para> |
| 732 | 270 | </td> | 270 | </td> |
| 733 | 271 | </tr> | 271 | </tr> |
| 734 | 272 | </blockTable> | 272 | </blockTable> |
| 735 | @@ -275,22 +275,22 @@ | |||
| 736 | 275 | <blockTable colWidths="56.0,56.0,217.0,70.0,70.0,70.0" style="Table_Move_Line_Content"> | 275 | <blockTable colWidths="56.0,56.0,217.0,70.0,70.0,70.0" style="Table_Move_Line_Content"> |
| 737 | 276 | <tr> | 276 | <tr> |
| 738 | 277 | <td> | 277 | <td> |
| 755 | 278 | <para style="terp_default_9_Italic">[[ formatLang(move_a['date'],date = True) ]]</para> | 278 | <para style="terp_default_9_Italic"><i>[[ formatLang(move_a['date'],date = True) ]]</i></para> |
| 756 | 279 | </td> | 279 | </td> |
| 757 | 280 | <td> | 280 | <td> |
| 758 | 281 | <para style="terp_default_9_Italic">[[ move_a['cj'] ]]</para> | 281 | <para style="terp_default_9_Italic"><i>[[ move_a['cj'] ]]</i></para> |
| 759 | 282 | </td> | 282 | </td> |
| 760 | 283 | <td> | 283 | <td> |
| 761 | 284 | <para style="terp_default_9_Italic">[[ move_a['name'] ]]</para> | 284 | <para style="terp_default_9_Italic"><i>[[ move_a['name'] ]]</i></para> |
| 762 | 285 | </td> | 285 | </td> |
| 763 | 286 | <td> | 286 | <td> |
| 764 | 287 | <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]] </para> | 287 | <para style="terp_default_9_italic_Rignt"><i>[[ formatLang( move_a['debit'] )]] </i></para> |
| 765 | 288 | </td> | 288 | </td> |
| 766 | 289 | <td> | 289 | <td> |
| 767 | 290 | <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para> | 290 | <para style="terp_default_9_italic_Rignt"><i>[[ formatLang( move_a['credit']) ]]</i> </para> |
| 768 | 291 | </td> | 291 | </td> |
| 769 | 292 | <td> | 292 | <td> |
| 770 | 293 | <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance'], currency_obj = company.currency_id)]]</para> | 293 | <para style="terp_default_9_italic_Rignt"><i>[[ formatLang( move_a['balance'], currency_obj = company.currency_id)]]</i></para> |
| 771 | 294 | </td> | 294 | </td> |
| 772 | 295 | </tr> | 295 | </tr> |
| 773 | 296 | </blockTable> | 296 | </blockTable> |
| 774 | 297 | 297 | ||
| 775 | === modified file 'account/project/report/inverted_analytic_balance.rml' | |||
| 776 | --- account/project/report/inverted_analytic_balance.rml 2012-11-29 22:26:45 +0000 | |||
| 777 | +++ account/project/report/inverted_analytic_balance.rml 2013-08-13 05:40:59 +0000 | |||
| 778 | @@ -53,37 +53,37 @@ | |||
| 779 | 53 | <initialize> | 53 | <initialize> |
| 780 | 54 | <paraStyle name="all" alignment="justify"/> | 54 | <paraStyle name="all" alignment="justify"/> |
| 781 | 55 | </initialize> | 55 | </initialize> |
| 813 | 56 | <paraStyle name="Standard" fontName="Helvetica"/> | 56 | <paraStyle name="Standard"/> |
| 814 | 57 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 57 | <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/> |
| 815 | 58 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 58 | <paraStyle name="List" spaceBefore="0.0" spaceAfter="6.0"/> |
| 816 | 59 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/> | 59 | <paraStyle name="Table Contents" spaceBefore="0.0" spaceAfter="0.0"/> |
| 817 | 60 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 60 | <paraStyle name="Table Heading" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 818 | 61 | <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 61 | <paraStyle name="Caption" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> |
| 819 | 62 | <paraStyle name="Index" fontName="Helvetica"/> | 62 | <paraStyle name="Index" /> |
| 820 | 63 | <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/> | 63 | <paraStyle name="Heading" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/> |
| 821 | 64 | <paraStyle name="Footer" fontName="Helvetica"/> | 64 | <paraStyle name="Footer" /> |
| 822 | 65 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 65 | <paraStyle name="Horizontal Line" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> |
| 823 | 66 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 66 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 824 | 67 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 67 | <paraStyle name="Heading 9" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> |
| 825 | 68 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 68 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 826 | 69 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 69 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 827 | 70 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 70 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 828 | 71 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 71 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 829 | 72 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 72 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 830 | 73 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 73 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 831 | 74 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 74 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 832 | 75 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 75 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 833 | 76 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 76 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 834 | 77 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 77 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 835 | 78 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 78 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 836 | 79 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 79 | <paraStyle name="terp_header_Centre" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 837 | 80 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 80 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 838 | 81 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 81 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 839 | 82 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 82 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 840 | 83 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 83 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 841 | 84 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 84 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 842 | 85 | <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/> | 85 | <paraStyle name="terp_default_space" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/> |
| 843 | 86 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 86 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 844 | 87 | <images/> | 87 | <images/> |
| 845 | 88 | </stylesheet> | 88 | </stylesheet> |
| 846 | 89 | <story> | 89 | <story> |
| 847 | @@ -92,22 +92,22 @@ | |||
| 848 | 92 | <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table"> | 92 | <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table"> |
| 849 | 93 | <tr> | 93 | <tr> |
| 850 | 94 | <td> | 94 | <td> |
| 867 | 95 | <para style="terp_tblheader_Details">Code</para> | 95 | <para style="terp_tblheader_Details"><b>Code</b></para> |
| 868 | 96 | </td> | 96 | </td> |
| 869 | 97 | <td> | 97 | <td> |
| 870 | 98 | <para style="terp_tblheader_Details">Name</para> | 98 | <para style="terp_tblheader_Details"><b>Name</b></para> |
| 871 | 99 | </td> | 99 | </td> |
| 872 | 100 | <td> | 100 | <td> |
| 873 | 101 | <para style="terp_tblheader_Details_Right">Debit</para> | 101 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 874 | 102 | </td> | 102 | </td> |
| 875 | 103 | <td> | 103 | <td> |
| 876 | 104 | <para style="terp_tblheader_Details_Right">Credit</para> | 104 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 877 | 105 | </td> | 105 | </td> |
| 878 | 106 | <td> | 106 | <td> |
| 879 | 107 | <para style="terp_tblheader_Details_Right">Balance</para> | 107 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 880 | 108 | </td> | 108 | </td> |
| 881 | 109 | <td> | 109 | <td> |
| 882 | 110 | <para style="terp_tblheader_Details_Right">Quantity</para> | 110 | <para style="terp_tblheader_Details_Right"><b>Quantity</b></para> |
| 883 | 111 | </td> | 111 | </td> |
| 884 | 112 | </tr> | 112 | </tr> |
| 885 | 113 | </blockTable> | 113 | </blockTable> |
| 886 | @@ -115,7 +115,7 @@ | |||
| 887 | 115 | <blockTable colWidths="539.0" style="Table_Title"> | 115 | <blockTable colWidths="539.0" style="Table_Title"> |
| 888 | 116 | <tr> | 116 | <tr> |
| 889 | 117 | <td> | 117 | <td> |
| 891 | 118 | <para style="terp_header_Centre">Inverted Analytic Balance - [[ company.currency_id.name ]]</para> | 118 | <para style="terp_header_Centre"><b>Inverted Analytic Balance - [[ company.currency_id.name ]]</b></para> |
| 892 | 119 | </td> | 119 | </td> |
| 893 | 120 | </tr> | 120 | </tr> |
| 894 | 121 | </blockTable> | 121 | </blockTable> |
| 895 | @@ -125,22 +125,22 @@ | |||
| 896 | 125 | <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table"> | 125 | <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table"> |
| 897 | 126 | <tr> | 126 | <tr> |
| 898 | 127 | <td> | 127 | <td> |
| 915 | 128 | <para style="terp_tblheader_Details">Code</para> | 128 | <para style="terp_tblheader_Details"><b>Code</b></para> |
| 916 | 129 | </td> | 129 | </td> |
| 917 | 130 | <td> | 130 | <td> |
| 918 | 131 | <para style="terp_tblheader_Details">Name</para> | 131 | <para style="terp_tblheader_Details"><b>Name</b></para> |
| 919 | 132 | </td> | 132 | </td> |
| 920 | 133 | <td> | 133 | <td> |
| 921 | 134 | <para style="terp_tblheader_Details_Right">Debit</para> | 134 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 922 | 135 | </td> | 135 | </td> |
| 923 | 136 | <td> | 136 | <td> |
| 924 | 137 | <para style="terp_tblheader_Details_Right">Credit</para> | 137 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 925 | 138 | </td> | 138 | </td> |
| 926 | 139 | <td> | 139 | <td> |
| 927 | 140 | <para style="terp_tblheader_Details_Right">Balance</para> | 140 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 928 | 141 | </td> | 141 | </td> |
| 929 | 142 | <td> | 142 | <td> |
| 930 | 143 | <para style="terp_tblheader_Details_Right">Quantity</para> | 143 | <para style="terp_tblheader_Details_Right"><b>Quantity</b></para> |
| 931 | 144 | </td> | 144 | </td> |
| 932 | 145 | </tr> | 145 | </tr> |
| 933 | 146 | </blockTable> | 146 | </blockTable> |
| 934 | @@ -150,7 +150,7 @@ | |||
| 935 | 150 | <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table1"> | 150 | <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table1"> |
| 936 | 151 | <tr> | 151 | <tr> |
| 937 | 152 | <td> | 152 | <td> |
| 939 | 153 | <para style="terp_tblheader_Details">Total</para> | 153 | <para style="terp_tblheader_Details"><b>Total</b></para> |
| 940 | 154 | </td> | 154 | </td> |
| 941 | 155 | <td> | 155 | <td> |
| 942 | 156 | <para style="terp_tblheader_Details"> | 156 | <para style="terp_tblheader_Details"> |
| 943 | @@ -158,16 +158,16 @@ | |||
| 944 | 158 | </para> | 158 | </para> |
| 945 | 159 | </td> | 159 | </td> |
| 946 | 160 | <td> | 160 | <td> |
| 957 | 161 | <para style="terp_tblheader_Details_Right">[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para> | 161 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</b></para> |
| 958 | 162 | </td> | 162 | </td> |
| 959 | 163 | <td> | 163 | <td> |
| 960 | 164 | <para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para> | 164 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</b></para> |
| 961 | 165 | </td> | 165 | </td> |
| 962 | 166 | <td> | 166 | <td> |
| 963 | 167 | <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para> | 167 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</b></para> |
| 964 | 168 | </td> | 168 | </td> |
| 965 | 169 | <td> | 169 | <td> |
| 966 | 170 | <para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para> | 170 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</b></para> |
| 967 | 171 | </td> | 171 | </td> |
| 968 | 172 | </tr> | 172 | </tr> |
| 969 | 173 | </blockTable> | 173 | </blockTable> |
| 970 | @@ -176,22 +176,22 @@ | |||
| 971 | 176 | <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table3"> | 176 | <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table3"> |
| 972 | 177 | <tr> | 177 | <tr> |
| 973 | 178 | <td> | 178 | <td> |
| 990 | 179 | <para style="terp_default_Bold_9">[[ (not move_g) and removeParentNode('blockTable') ]] [[ move_g['code'] ]]</para> | 179 | <para style="terp_default_Bold_9"><b>[[ (not move_g) and removeParentNode('blockTable') ]] [[ move_g['code'] ]]</b></para> |
| 991 | 180 | </td> | 180 | </td> |
| 992 | 181 | <td> | 181 | <td> |
| 993 | 182 | <para style="terp_default_Bold_9">[[ move_g['name'] ]]</para> | 182 | <para style="terp_default_Bold_9"><b>[[ move_g['name'] ]]</b></para> |
| 994 | 183 | </td> | 183 | </td> |
| 995 | 184 | <td> | 184 | <td> |
| 996 | 185 | <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['debit'])]]</para> | 185 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(move_g['debit'])]]</b></para> |
| 997 | 186 | </td> | 186 | </td> |
| 998 | 187 | <td> | 187 | <td> |
| 999 | 188 | <para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para> | 188 | <para style="terp_tblheader_Details_Right"><b>[[formatLang(move_g['credit'])]]</b></para> |
| 1000 | 189 | </td> | 189 | </td> |
| 1001 | 190 | <td> | 190 | <td> |
| 1002 | 191 | <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'], currency_obj = company.currency_id)]]</para> | 191 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang(move_g['balance'], currency_obj = company.currency_id)]]</b></para> |
| 1003 | 192 | </td> | 192 | </td> |
| 1004 | 193 | <td> | 193 | <td> |
| 1005 | 194 | <para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para> | 194 | <para style="terp_tblheader_Details_Right"><b>[[formatLang(move_g['quantity']) ]]</b></para> |
| 1006 | 195 | </td> | 195 | </td> |
| 1007 | 196 | </tr> | 196 | </tr> |
| 1008 | 197 | </blockTable> | 197 | </blockTable> |
| 1009 | @@ -226,4 +226,4 @@ | |||
| 1010 | 226 | </section> | 226 | </section> |
| 1011 | 227 | </pto> | 227 | </pto> |
| 1012 | 228 | </story> | 228 | </story> |
| 1013 | 229 | </document> | ||
| 1014 | 230 | \ No newline at end of file | 229 | \ No newline at end of file |
| 1015 | 230 | </document> | ||
| 1016 | 231 | 231 | ||
| 1017 | === modified file 'account/project/report/quantity_cost_ledger.rml' | |||
| 1018 | --- account/project/report/quantity_cost_ledger.rml 2011-12-21 09:08:11 +0000 | |||
| 1019 | +++ account/project/report/quantity_cost_ledger.rml 2013-08-13 05:40:59 +0000 | |||
| 1020 | @@ -79,41 +79,41 @@ | |||
| 1021 | 79 | <initialize> | 79 | <initialize> |
| 1022 | 80 | <paraStyle name="all" alignment="justify"/> | 80 | <paraStyle name="all" alignment="justify"/> |
| 1023 | 81 | </initialize> | 81 | </initialize> |
| 1059 | 82 | <paraStyle name="Standard" fontName="Helvetica"/> | 82 | <paraStyle name="Standard"/> |
| 1060 | 83 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 83 | <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1061 | 84 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 84 | <paraStyle name="List" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1062 | 85 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/> | 85 | <paraStyle name="Table Contents" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1063 | 86 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 86 | <paraStyle name="Table Heading" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1064 | 87 | <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 87 | <paraStyle name="Caption" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1065 | 88 | <paraStyle name="Index" fontName="Helvetica"/> | 88 | <paraStyle name="Index" /> |
| 1066 | 89 | <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/> | 89 | <paraStyle name="Heading" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1067 | 90 | <paraStyle name="Footer" fontName="Helvetica"/> | 90 | <paraStyle name="Footer" /> |
| 1068 | 91 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 91 | <paraStyle name="Horizontal Line" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> |
| 1069 | 92 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 92 | <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1070 | 93 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 93 | <paraStyle name="Heading 9" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1071 | 94 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 94 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1072 | 95 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 95 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1073 | 96 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 96 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1074 | 97 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 97 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1075 | 98 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 98 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1076 | 99 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 99 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1077 | 100 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 100 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1078 | 101 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 101 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1079 | 102 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 102 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1080 | 103 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 103 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1081 | 104 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/> | 104 | <paraStyle name="terp_header_Right" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1082 | 105 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | 105 | <paraStyle name="terp_header_Centre" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1083 | 106 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 106 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1084 | 107 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 107 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1085 | 108 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 108 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1086 | 109 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 109 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1087 | 110 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 110 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1088 | 111 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 111 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1089 | 112 | <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 112 | <paraStyle name="terp_default_Bold_9_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1090 | 113 | <paraStyle name="terp_default_9_Italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 113 | <paraStyle name="terp_default_9_Italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1091 | 114 | <paraStyle name="terp_default_9_Italic_Right" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 114 | <paraStyle name="terp_default_9_Italic_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1092 | 115 | <paraStyle name="terp_default_Rignt_9_U" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 115 | <paraStyle name="terp_default_Rignt_9_U" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1093 | 116 | <paraStyle name="terp_default_Bold_9_Right_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 116 | <paraStyle name="terp_default_Bold_9_Right_U" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1094 | 117 | <images/> | 117 | <images/> |
| 1095 | 118 | </stylesheet> | 118 | </stylesheet> |
| 1096 | 119 | <story> | 119 | <story> |
| 1097 | @@ -122,16 +122,16 @@ | |||
| 1098 | 122 | <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line"> | 122 | <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line"> |
| 1099 | 123 | <tr> | 123 | <tr> |
| 1100 | 124 | <td> | 124 | <td> |
| 1111 | 125 | <para style="terp_tblheader_Details">Code/Date</para> | 125 | <para style="terp_tblheader_Details"><b>Code/Date</b></para> |
| 1112 | 126 | </td> | 126 | </td> |
| 1113 | 127 | <td> | 127 | <td> |
| 1114 | 128 | <para style="terp_tblheader_Details">J.C./Move name</para> | 128 | <para style="terp_tblheader_Details"><b>J.C./Move name</b></para> |
| 1115 | 129 | </td> | 129 | </td> |
| 1116 | 130 | <td> | 130 | <td> |
| 1117 | 131 | <para style="terp_tblheader_Details_Centre">Quantity</para> | 131 | <para style="terp_tblheader_Details_Centre"><b>Quantity</b></para> |
| 1118 | 132 | </td> | 132 | </td> |
| 1119 | 133 | <td> | 133 | <td> |
| 1120 | 134 | <para style="terp_tblheader_Details_Right">Total</para> | 134 | <para style="terp_tblheader_Details_Right"><b>Total</b></para> |
| 1121 | 135 | </td> | 135 | </td> |
| 1122 | 136 | </tr> | 136 | </tr> |
| 1123 | 137 | </blockTable> | 137 | </blockTable> |
| 1124 | @@ -144,7 +144,7 @@ | |||
| 1125 | 144 | </para> | 144 | </para> |
| 1126 | 145 | </td> | 145 | </td> |
| 1127 | 146 | <td> | 146 | <td> |
| 1129 | 147 | <para style="terp_header_Centre">Cost Ledger</para> | 147 | <para style="terp_header_Centre"><b>Cost Ledger</b></para> |
| 1130 | 148 | </td> | 148 | </td> |
| 1131 | 149 | <td> | 149 | <td> |
| 1132 | 150 | <para style="terp_header_Right"> | 150 | <para style="terp_header_Right"> |
| 1133 | @@ -156,13 +156,13 @@ | |||
| 1134 | 156 | <blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Detail"> | 156 | <blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Detail"> |
| 1135 | 157 | <tr> | 157 | <tr> |
| 1136 | 158 | <td> | 158 | <td> |
| 1144 | 159 | <para style="terp_tblheader_General_Centre">Period from</para> | 159 | <para style="terp_tblheader_General_Centre"><b>Period from</b></para> |
| 1145 | 160 | </td> | 160 | </td> |
| 1146 | 161 | <td> | 161 | <td> |
| 1147 | 162 | <para style="terp_tblheader_General_Centre">Period to</para> | 162 | <para style="terp_tblheader_General_Centre"><b>Period to</b></para> |
| 1148 | 163 | </td> | 163 | </td> |
| 1149 | 164 | <td> | 164 | <td> |
| 1150 | 165 | <para style="terp_tblheader_General_Centre">Printing date</para> | 165 | <para style="terp_tblheader_General_Centre"><b>Printing date</b></para> |
| 1151 | 166 | </td> | 166 | </td> |
| 1152 | 167 | </tr> | 167 | </tr> |
| 1153 | 168 | </blockTable> | 168 | </blockTable> |
| 1154 | @@ -188,36 +188,36 @@ | |||
| 1155 | 188 | <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line"> | 188 | <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line"> |
| 1156 | 189 | <tr> | 189 | <tr> |
| 1157 | 190 | <td> | 190 | <td> |
| 1168 | 191 | <para style="terp_tblheader_Details">Code/Date</para> | 191 | <para style="terp_tblheader_Details"><b>Code/Date</b></para> |
| 1169 | 192 | </td> | 192 | </td> |
| 1170 | 193 | <td> | 193 | <td> |
| 1171 | 194 | <para style="terp_tblheader_Details">J.C./Move name</para> | 194 | <para style="terp_tblheader_Details"><b>J.C./Move name</b></para> |
| 1172 | 195 | </td> | 195 | </td> |
| 1173 | 196 | <td> | 196 | <td> |
| 1174 | 197 | <para style="terp_tblheader_Details_Centre">Quantity</para> | 197 | <para style="terp_tblheader_Details_Centre"><b>Quantity</b></para> |
| 1175 | 198 | </td> | 198 | </td> |
| 1176 | 199 | <td> | 199 | <td> |
| 1177 | 200 | <para style="terp_tblheader_Details_Right">Total</para> | 200 | <para style="terp_tblheader_Details_Right"><b>Total</b></para> |
| 1178 | 201 | </td> | 201 | </td> |
| 1179 | 202 | </tr> | 202 | </tr> |
| 1180 | 203 | </blockTable> | 203 | </blockTable> |
| 1181 | 204 | <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Final_Total"> | 204 | <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Final_Total"> |
| 1182 | 205 | <tr> | 205 | <tr> |
| 1183 | 206 | <td> | 206 | <td> |
| 1198 | 207 | <para style="terp_default_Bold_9">Total:</para> | 207 | <para style="terp_default_Bold_9"><b>Total:</b></para> |
| 1199 | 208 | </td> | 208 | </td> |
| 1200 | 209 | <td> | 209 | <td> |
| 1201 | 210 | <para style="terp_default_Bold_9"> | 210 | <para style="terp_default_Bold_9"> |
| 1202 | 211 | <font color="white"> </font> | 211 | <font color="white"> </font> |
| 1203 | 212 | </para> | 212 | </para> |
| 1204 | 213 | </td> | 213 | </td> |
| 1205 | 214 | <td> | 214 | <td> |
| 1206 | 215 | <para style="terp_default_Bold_9"> | 215 | <para style="terp_default_Bold_9"> |
| 1207 | 216 | <font color="white"> </font> | 216 | <font color="white"> </font> |
| 1208 | 217 | </para> | 217 | </para> |
| 1209 | 218 | </td> | 218 | </td> |
| 1210 | 219 | <td> | 219 | <td> |
| 1211 | 220 | <para style="terp_default_Bold_9_Right_U">[[ formatLang (sum_quantity(objects,data['form']['date1'],data['form']['date2'], data['form']['journal']) ) ]]</para> | 220 | <para style="terp_default_Bold_9_Right_U"><b>[[ formatLang (sum_quantity(objects,data['form']['date1'],data['form']['date2'], data['form']['journal']) ) ]]</b></para> |
| 1212 | 221 | </td> | 221 | </td> |
| 1213 | 222 | </tr> | 222 | </tr> |
| 1214 | 223 | </blockTable> | 223 | </blockTable> |
| 1215 | @@ -226,16 +226,16 @@ | |||
| 1216 | 226 | <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Account_Detail"> | 226 | <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Account_Detail"> |
| 1217 | 227 | <tr> | 227 | <tr> |
| 1218 | 228 | <td> | 228 | <td> |
| 1229 | 229 | <para style="terp_default_Bold_9">[[ o.code ]]<font face="Helvetica" size="10.0"/></para> | 229 | <para style="terp_default_Bold_9"><b>[[ o.code ]]</b><font size="10.0"/></para> |
| 1230 | 230 | </td> | 230 | </td> |
| 1231 | 231 | <td> | 231 | <td> |
| 1232 | 232 | <para style="terp_default_Bold_9">[[ o.complete_name ]]<font face="Helvetica" size="10.0"/></para> | 232 | <para style="terp_default_Bold_9"><b>[[ o.complete_name ]]</b><font size="10.0"/></para> |
| 1233 | 233 | </td> | 233 | </td> |
| 1234 | 234 | <td> | 234 | <td> |
| 1235 | 235 | <para style="terp_default_Bold_9">Max Qty: [[ formatLang (o.quantity_max )]]</para> | 235 | <para style="terp_default_Bold_9"><b>Max Qty: [[ formatLang (o.quantity_max )]]</b></para> |
| 1236 | 236 | </td> | 236 | </td> |
| 1237 | 237 | <td> | 237 | <td> |
| 1238 | 238 | <para style="terp_default_Bold_9_Right_U">[[ formatLang (account_sum_quantity(o.id,data['form']['date1'],data['form']['date2'], data['form']['journal']) )]]</para> | 238 | <para style="terp_default_Bold_9_Right_U"><b>[[ formatLang (account_sum_quantity(o.id,data['form']['date1'],data['form']['date2'], data['form']['journal']) )]]</b></para> |
| 1239 | 239 | </td> | 239 | </td> |
| 1240 | 240 | </tr> | 240 | </tr> |
| 1241 | 241 | </blockTable> | 241 | </blockTable> |
| 1242 | @@ -244,30 +244,30 @@ | |||
| 1243 | 244 | <blockTable colWidths="57.0,407.0,71.0" style="Table_Analytical_Detail"> | 244 | <blockTable colWidths="57.0,407.0,71.0" style="Table_Analytical_Detail"> |
| 1244 | 245 | <tr> | 245 | <tr> |
| 1245 | 246 | <td> | 246 | <td> |
| 1253 | 247 | <para style="terp_default_Bold_9">[[ move_g['code'] ]] </para> | 247 | <para style="terp_default_Bold_9"><b>[[ move_g['code'] ]]</b> </para> |
| 1254 | 248 | </td> | 248 | </td> |
| 1255 | 249 | <td> | 249 | <td> |
| 1256 | 250 | <para style="terp_default_Bold_9">[[ move_g['name'] ]]</para> | 250 | <para style="terp_default_Bold_9"><b>[[ move_g['name'] ]]</b></para> |
| 1257 | 251 | </td> | 251 | </td> |
| 1258 | 252 | <td> | 252 | <td> |
| 1259 | 253 | <para style="terp_default_Bold_9_Right_U">[[ formatLang (move_g['quantity']) ]]</para> | 253 | <para style="terp_default_Bold_9_Right_U"><b>[[ formatLang (move_g['quantity']) ]]</b></para> |
| 1260 | 254 | </td> | 254 | </td> |
| 1261 | 255 | </tr> | 255 | </tr> |
| 1262 | 256 | </blockTable> | 256 | </blockTable> |
| 1263 | 257 | <blockTable colWidths="57.0,71.0,336.0,71.0" style="Table_Move_Line_Content"> | 257 | <blockTable colWidths="57.0,71.0,336.0,71.0" style="Table_Move_Line_Content"> |
| 1264 | 258 | <tr> | 258 | <tr> |
| 1265 | 259 | <td> | 259 | <td> |
| 1277 | 260 | <para style="terp_default_9_Italic">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]</para> | 260 | <para style="terp_default_9_Italic"><i>[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]</i></para> |
| 1278 | 261 | <para style="terp_default_9_Italic">[[ formatLang(move_a['date'],date = True) ]]</para> | 261 | <para style="terp_default_9_Italic"><i>[[ formatLang(move_a['date'],date = True) ]]</i></para> |
| 1279 | 262 | </td> | 262 | </td> |
| 1280 | 263 | <td> | 263 | <td> |
| 1281 | 264 | <para style="terp_default_9_Italic">[[ move_a['cj'] ]]</para> | 264 | <para style="terp_default_9_Italic"><i>[[ move_a['cj'] ]]</i></para> |
| 1282 | 265 | </td> | 265 | </td> |
| 1283 | 266 | <td> | 266 | <td> |
| 1284 | 267 | <para style="terp_default_9_Italic">[[ move_a['name'] ]]</para> | 267 | <para style="terp_default_9_Italic"><i>[[ move_a['name'] ]]</i></para> |
| 1285 | 268 | </td> | 268 | </td> |
| 1286 | 269 | <td> | 269 | <td> |
| 1287 | 270 | <para style="terp_default_9_Italic_Right">[[ formatLang (move_a['quantity'] )]]</para> | 270 | <para style="terp_default_9_Italic_Right"><i>[[ formatLang (move_a['quantity'] )]]</i></para> |
| 1288 | 271 | </td> | 271 | </td> |
| 1289 | 272 | </tr> | 272 | </tr> |
| 1290 | 273 | </blockTable> | 273 | </blockTable> |
| 1291 | @@ -278,4 +278,4 @@ | |||
| 1292 | 278 | </section> | 278 | </section> |
| 1293 | 279 | </pto> | 279 | </pto> |
| 1294 | 280 | </story> | 280 | </story> |
| 1295 | 281 | </document> | ||
| 1296 | 282 | \ No newline at end of file | 281 | \ No newline at end of file |
| 1297 | 282 | </document> | ||
| 1298 | 283 | 283 | ||
| 1299 | === modified file 'account/report/account_aged_partner_balance.rml' | |||
| 1300 | --- account/report/account_aged_partner_balance.rml 2013-06-14 21:36:02 +0000 | |||
| 1301 | +++ account/report/account_aged_partner_balance.rml 2013-08-13 05:40:59 +0000 | |||
| 1302 | @@ -54,49 +54,27 @@ | |||
| 1303 | 54 | <initialize> | 54 | <initialize> |
| 1304 | 55 | <paraStyle name="all" alignment="justify"/> | 55 | <paraStyle name="all" alignment="justify"/> |
| 1305 | 56 | </initialize> | 56 | </initialize> |
| 1349 | 57 | <paraStyle name="P1" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 57 | <paraStyle name="P2_content" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1350 | 58 | <paraStyle name="P2" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | 58 | <paraStyle name="Total" fontSize="8.5" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1351 | 59 | <paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | 59 | <paraStyle name="Total_right" fontSize="8.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1352 | 60 | <paraStyle name="Total" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | 60 | <paraStyle name="content" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1353 | 61 | <paraStyle name="Total_right" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 61 | <paraStyle name="P9" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1354 | 62 | <paraStyle name="P3" fontName="Helvetica" fontSize="15.0" leading="20" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 62 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1355 | 63 | <paraStyle name="P4" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 63 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1356 | 64 | <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 64 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1357 | 65 | <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 65 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1358 | 66 | <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 66 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1359 | 67 | <paraStyle name="P8" fontName="Helvetica" fontSize="8.3" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 67 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1360 | 68 | <paraStyle name="content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 68 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1361 | 69 | <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 69 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1362 | 70 | <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 70 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1363 | 71 | <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 71 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1364 | 72 | <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/> | 72 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1365 | 73 | <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/> | 73 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1366 | 74 | <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 74 | <paraStyle name="terp_default_9_italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1367 | 75 | <paraStyle name="P10" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 75 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1368 | 76 | <paraStyle name="Standard" fontName="Helvetica"/> | 76 | <paraStyle name="terp_default_Right_9_Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1369 | 77 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 77 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1327 | 78 | <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1328 | 79 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 1329 | 80 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 1330 | 81 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 1331 | 82 | <paraStyle name="Caption" fontName="Helvetica" fontSize="8.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1332 | 83 | <paraStyle name="Index" fontName="Helvetica"/> | ||
| 1333 | 84 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1334 | 85 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1335 | 86 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1336 | 87 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1337 | 88 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1338 | 89 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1339 | 90 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1340 | 91 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1341 | 92 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1342 | 93 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1343 | 94 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1344 | 95 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1345 | 96 | <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1346 | 97 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1347 | 98 | <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1348 | 99 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1370 | 100 | 78 | ||
| 1371 | 101 | </stylesheet> | 79 | </stylesheet> |
| 1372 | 102 | <story> | 80 | <story> |
| 1373 | @@ -105,32 +83,32 @@ | |||
| 1374 | 105 | <tr> | 83 | <tr> |
| 1375 | 106 | <td><para style="terp_header"><font color="white"> </font></para> | 84 | <td><para style="terp_header"><font color="white"> </font></para> |
| 1376 | 107 | </td> | 85 | </td> |
| 1378 | 108 | <td><para style="terp_header_Centre">Aged Trial Balance</para></td> | 86 | <td><para style="terp_header_Centre"><b>Aged Trial Balance</b></para></td> |
| 1379 | 109 | <td><para style="terp_header"><font color="white"> </font></para></td> | 87 | <td><para style="terp_header"><font color="white"> </font></para></td> |
| 1380 | 110 | </tr> | 88 | </tr> |
| 1381 | 111 | </blockTable> | 89 | </blockTable> |
| 1382 | 112 | <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table8"> | 90 | <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table8"> |
| 1383 | 113 | <tr> | 91 | <tr> |
| 1384 | 114 | <td> | 92 | <td> |
| 1404 | 115 | <para style="terp_tblheader_General_Centre">Chart of Accounts</para> | 93 | <para style="terp_tblheader_General_Centre"><b>Chart of Accounts</b></para> |
| 1405 | 116 | </td> | 94 | </td> |
| 1406 | 117 | <td> | 95 | <td> |
| 1407 | 118 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> | 96 | <para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para> |
| 1408 | 119 | </td> | 97 | </td> |
| 1409 | 120 | <td> | 98 | <td> |
| 1410 | 121 | <para style="terp_tblheader_General_Centre">Start Date</para> | 99 | <para style="terp_tblheader_General_Centre"><b>Start Date</b></para> |
| 1411 | 122 | </td> | 100 | </td> |
| 1412 | 123 | <td> | 101 | <td> |
| 1413 | 124 | <para style="terp_tblheader_General_Centre">Period Length(days)</para> | 102 | <para style="terp_tblheader_General_Centre"><b>Period Length(days)</b></para> |
| 1414 | 125 | </td> | 103 | </td> |
| 1415 | 126 | <td> | 104 | <td> |
| 1416 | 127 | <para style="terp_tblheader_General_Centre">Partner's</para> | 105 | <para style="terp_tblheader_General_Centre"><b>Partner's</b></para> |
| 1417 | 128 | </td> | 106 | </td> |
| 1418 | 129 | <td> | 107 | <td> |
| 1419 | 130 | <para style="terp_tblheader_General_Centre">Analysis Direction</para> | 108 | <para style="terp_tblheader_General_Centre"><b>Analysis Direction</b></para> |
| 1420 | 131 | </td> | 109 | </td> |
| 1421 | 132 | <td> | 110 | <td> |
| 1422 | 133 | <para style="terp_tblheader_General_Centre">Target Moves</para> | 111 | <para style="terp_tblheader_General_Centre"><b>Target Moves</b></para> |
| 1423 | 134 | </td> | 112 | </td> |
| 1424 | 135 | </tr> | 113 | </tr> |
| 1425 | 136 | <tr> | 114 | <tr> |
| 1426 | @@ -168,26 +146,26 @@ | |||
| 1427 | 168 | <para style="terp_tblheader_Details">Partners</para> | 146 | <para style="terp_tblheader_Details">Partners</para> |
| 1428 | 169 | </td> | 147 | </td> |
| 1429 | 170 | <td> | 148 | <td> |
| 1450 | 171 | <para style="terp_tblheader_Details_Right">Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]]</para> | 149 | <para style="terp_tblheader_Details_Right"><b>Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]]</b></para> |
| 1451 | 172 | <para style="terp_tblheader_Details_Right">Not due[[ data['form']['direction_selection'] != 'future' and ' ' or removeParentNode('para') ]]</para> | 150 | <para style="terp_tblheader_Details_Right"><b>Not due[[ data['form']['direction_selection'] != 'future' and ' ' or removeParentNode('para') ]]</b></para> |
| 1452 | 173 | </td> | 151 | </td> |
| 1453 | 174 | <td> | 152 | <td> |
| 1454 | 175 | <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para> | 153 | <para style="terp_tblheader_Details_Right"><b>[[ data['form']['4']['name'] ]]</b></para> |
| 1455 | 176 | </td> | 154 | </td> |
| 1456 | 177 | <td> | 155 | <td> |
| 1457 | 178 | <para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]</para> | 156 | <para style="terp_tblheader_Details_Right"><b>[[ data['form']['3']['name'] ]]</b></para> |
| 1458 | 179 | </td> | 157 | </td> |
| 1459 | 180 | <td> | 158 | <td> |
| 1460 | 181 | <para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]</para> | 159 | <para style="terp_tblheader_Details_Right"><b>[[ data['form']['2']['name'] ]]</b></para> |
| 1461 | 182 | </td> | 160 | </td> |
| 1462 | 183 | <td> | 161 | <td> |
| 1463 | 184 | <para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]</para> | 162 | <para style="terp_tblheader_Details_Right"><b>[[ data['form']['1']['name'] ]]</b></para> |
| 1464 | 185 | </td> | 163 | </td> |
| 1465 | 186 | <td> | 164 | <td> |
| 1466 | 187 | <para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]</para> | 165 | <para style="terp_tblheader_Details_Right"><b>[[ data['form']['0']['name'] ]]</b></para> |
| 1467 | 188 | </td> | 166 | </td> |
| 1468 | 189 | <td> | 167 | <td> |
| 1469 | 190 | <para style="terp_tblheader_Details_Right">Total</para> | 168 | <para style="terp_tblheader_Details_Right"><b>Total</b></para> |
| 1470 | 191 | </td> | 169 | </td> |
| 1471 | 192 | </tr> | 170 | </tr> |
| 1472 | 193 | 171 | ||
| 1473 | @@ -196,28 +174,28 @@ | |||
| 1474 | 196 | <td> | 174 | <td> |
| 1475 | 197 | <para style="P3"> <font color="white">[[ (get_lines(data['form']), 'partner') == False or removeParentNode('para') ]]</font></para> | 175 | <para style="P3"> <font color="white">[[ (get_lines(data['form']), 'partner') == False or removeParentNode('para') ]]</font></para> |
| 1476 | 198 | <para style="P3"> <font color="white">[[ (get_lines_with_out_partner(data['form']), 'not_partner') == False or removeParentNode('para') ]]</font></para> | 176 | <para style="P3"> <font color="white">[[ (get_lines_with_out_partner(data['form']), 'not_partner') == False or removeParentNode('para') ]]</font></para> |
| 1499 | 199 | <para style="Total">Account Total</para> | 177 | <para style="Total"><b>Account Total</b></para> |
| 1500 | 200 | </td> | 178 | </td> |
| 1501 | 201 | <td> | 179 | <td> |
| 1502 | 202 | <para style="Total_right">[[ formatLang(get_direction('6'), currency_obj=company.currency_id) ]]</para> | 180 | <para style="Total_right"><b>[[ formatLang(get_direction('6'), currency_obj=company.currency_id) ]]</b></para> |
| 1503 | 203 | </td> | 181 | </td> |
| 1504 | 204 | <td> | 182 | <td> |
| 1505 | 205 | <para style="Total_right">[[ formatLang(get_for_period('4'), currency_obj=company.currency_id) ]]</para> | 183 | <para style="Total_right"><b>[[ formatLang(get_for_period('4'), currency_obj=company.currency_id) ]]</b></para> |
| 1506 | 206 | </td> | 184 | </td> |
| 1507 | 207 | <td> | 185 | <td> |
| 1508 | 208 | <para style="Total_right">[[ formatLang(get_for_period('3'), currency_obj=company.currency_id) ]]</para> | 186 | <para style="Total_right"><b>[[ formatLang(get_for_period('3'), currency_obj=company.currency_id) ]]</b></para> |
| 1509 | 209 | </td> | 187 | </td> |
| 1510 | 210 | <td> | 188 | <td> |
| 1511 | 211 | <para style="Total_right">[[ formatLang(get_for_period('2'), currency_obj=company.currency_id) ]]</para> | 189 | <para style="Total_right"><b>[[ formatLang(get_for_period('2'), currency_obj=company.currency_id) ]]</b></para> |
| 1512 | 212 | </td> | 190 | </td> |
| 1513 | 213 | <td> | 191 | <td> |
| 1514 | 214 | <para style="Total_right">[[ formatLang(get_for_period('1'), currency_obj=company.currency_id) ]]</para> | 192 | <para style="Total_right"><b>[[ formatLang(get_for_period('1'), currency_obj=company.currency_id) ]]</b></para> |
| 1515 | 215 | </td> | 193 | </td> |
| 1516 | 216 | <td> | 194 | <td> |
| 1517 | 217 | <para style="Total_right">[[ formatLang(get_for_period('0'), currency_obj=company.currency_id) ]]</para> | 195 | <para style="Total_right"><b>[[ formatLang(get_for_period('0'), currency_obj=company.currency_id) ]]</b></para> |
| 1518 | 218 | </td> | 196 | </td> |
| 1519 | 219 | <td> | 197 | <td> |
| 1520 | 220 | <para style="Total_right">[[ formatLang(get_total('5'), currency_obj=company.currency_id) ]]</para> | 198 | <para style="Total_right"><b>[[ formatLang(get_total('5'), currency_obj=company.currency_id) ]]</b></para> |
| 1521 | 221 | </td> | 199 | </td> |
| 1522 | 222 | </tr> | 200 | </tr> |
| 1523 | 223 | 201 | ||
| 1524 | 224 | 202 | ||
| 1525 | === modified file 'account/report/account_balance.rml' | |||
| 1526 | --- account/report/account_balance.rml 2013-06-14 21:36:02 +0000 | |||
| 1527 | +++ account/report/account_balance.rml 2013-08-13 05:40:59 +0000 | |||
| 1528 | @@ -139,57 +139,34 @@ | |||
| 1529 | 139 | <initialize> | 139 | <initialize> |
| 1530 | 140 | <paraStyle name="all" alignment="justify"/> | 140 | <paraStyle name="all" alignment="justify"/> |
| 1531 | 141 | </initialize> | 141 | </initialize> |
| 1583 | 142 | <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 142 | <paraStyle name="P3" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1584 | 143 | <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 143 | <paraStyle name="P8" /> |
| 1585 | 144 | <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 144 | <paraStyle name="P10" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0" alignment="RIGHT"/> |
| 1586 | 145 | <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 145 | <paraStyle name="P11" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1587 | 146 | <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 146 | <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1588 | 147 | <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> | 147 | <paraStyle name="P15" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1589 | 148 | <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 148 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1590 | 149 | <paraStyle name="P8" fontName="Helvetica"/> | 149 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1591 | 150 | <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 150 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1592 | 151 | <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0" alignment="RIGHT"/> | 151 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1593 | 152 | <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 152 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1594 | 153 | <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 153 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1595 | 154 | <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0" textColor="#ffffff"/> | 154 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1596 | 155 | <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> | 155 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1597 | 156 | <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | 156 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1598 | 157 | <paraStyle name="P16" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 157 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1599 | 158 | <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 158 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1600 | 159 | <paraStyle name="Standard" fontName="Helvetica"/> | 159 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1601 | 160 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 160 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1602 | 161 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 161 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1603 | 162 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 162 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1604 | 163 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 163 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1605 | 164 | <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 164 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1606 | 165 | <paraStyle name="Index" fontName="Helvetica"/> | 165 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1607 | 166 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 166 | <paraStyle name="terp_default_9_italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1608 | 167 | <paraStyle name="Footer" fontName="Helvetica"/> | 167 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1609 | 168 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 168 | <paraStyle name="terp_default_Right_9_Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1610 | 169 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 169 | <paraStyle name="P12a" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1560 | 170 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1561 | 171 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1562 | 172 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1563 | 173 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1564 | 174 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1565 | 175 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1566 | 176 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1567 | 177 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1568 | 178 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 1569 | 179 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1570 | 180 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1571 | 181 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1572 | 182 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1573 | 183 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1574 | 184 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1575 | 185 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1576 | 186 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1577 | 187 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1578 | 188 | <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1579 | 189 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1580 | 190 | <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1581 | 191 | <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1582 | 192 | <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1611 | 193 | <images/> | 170 | <images/> |
| 1612 | 194 | </stylesheet> | 171 | </stylesheet> |
| 1613 | 195 | <story> | 172 | <story> |
| 1614 | @@ -199,7 +176,7 @@ | |||
| 1615 | 199 | <blockTable colWidths="525.0" style="Table_Tilte_Table"> | 176 | <blockTable colWidths="525.0" style="Table_Tilte_Table"> |
| 1616 | 200 | <tr> | 177 | <tr> |
| 1617 | 201 | <td> | 178 | <td> |
| 1619 | 202 | <para style="P15">Trial Balance </para> | 179 | <para style="P15"><b>Trial Balance</b> </para> |
| 1620 | 203 | </td> | 180 | </td> |
| 1621 | 204 | </tr> | 181 | </tr> |
| 1622 | 205 | </blockTable> | 182 | </blockTable> |
| 1623 | @@ -212,20 +189,20 @@ | |||
| 1624 | 212 | <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8"> | 189 | <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8"> |
| 1625 | 213 | <tr> | 190 | <tr> |
| 1626 | 214 | <td> | 191 | <td> |
| 1641 | 215 | <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para> | 192 | <para style="terp_tblheader_General_Centre"><b>Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</b></para> |
| 1642 | 216 | <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para> | 193 | <para style="terp_tblheader_General_Centre"><b>Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</b></para> |
| 1643 | 217 | </td> | 194 | </td> |
| 1644 | 218 | <td> | 195 | <td> |
| 1645 | 219 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> | 196 | <para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para> |
| 1646 | 220 | </td> | 197 | </td> |
| 1647 | 221 | <td> | 198 | <td> |
| 1648 | 222 | <para style="terp_tblheader_General_Centre">Display Account</para> | 199 | <para style="terp_tblheader_General_Centre"><b>Display Account</b></para> |
| 1649 | 223 | </td> | 200 | </td> |
| 1650 | 224 | <td> | 201 | <td> |
| 1651 | 225 | <para style="terp_tblheader_General_Centre">Filter By <font>[[ data['form']['filter']!='filter_no' and get_filter(data) ]]</font> </para> | 202 | <para style="terp_tblheader_General_Centre"><b>Filter By </b><font>[[ data['form']['filter']!='filter_no' and get_filter(data) ]]</font> </para> |
| 1652 | 226 | </td> | 203 | </td> |
| 1653 | 227 | <td> | 204 | <td> |
| 1654 | 228 | <para style="terp_tblheader_General_Centre">Target Moves</para> | 205 | <para style="terp_tblheader_General_Centre"><b>Target Moves</b></para> |
| 1655 | 229 | </td> | 206 | </td> |
| 1656 | 230 | </tr> | 207 | </tr> |
| 1657 | 231 | <tr> | 208 | <tr> |
| 1658 | @@ -291,18 +268,23 @@ | |||
| 1659 | 291 | </para> | 268 | </para> |
| 1660 | 292 | <blockTable colWidths="80,215.0,80.0,80.0,80.0" style="Table2" repeatRows="1"> | 269 | <blockTable colWidths="80,215.0,80.0,80.0,80.0" style="Table2" repeatRows="1"> |
| 1661 | 293 | <tr noRowsplits="1"> | 270 | <tr noRowsplits="1"> |
| 1667 | 294 | <td><para style="P12a">Code</para></td> | 271 | <td><para style="P12a"><b>Code</b></para></td> |
| 1668 | 295 | <td><para style="P12a">Account</para></td> | 272 | <td><para style="P12a"><b>Account</b></para></td> |
| 1669 | 296 | <td><para style="P10">Debit</para></td> | 273 | <td><para style="P10"><b>Debit</b></para></td> |
| 1670 | 297 | <td><para style="P10">Credit</para></td> | 274 | <td><para style="P10"><b>Credit</b></para></td> |
| 1671 | 298 | <td><para style="P10">Balance</para></td> | 275 | <td><para style="P10"><b>Balance</b></para></td> |
| 1672 | 299 | </tr> | 276 | </tr> |
| 1673 | 300 | <tr> | 277 | <tr> |
| 1679 | 301 | <td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><i>[[ a['code'] or removeParentNode('tr') ]]</i></para></td> | 278 | |
| 1680 | 302 | <td><para style="P14"><font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font> </para></td> | 279 | <td><para style="P14"><font>[[ repeatIn(lines(data['form']), 'a') ]]</font><font>[[ a['type']<>'view' and removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['code'] ]]</font><b>[[ a['type']<>'view' and removeParentNode('font') ]] [[a['code'] ]]</b></para></td> |
| 1681 | 303 | <td><para style="P3"><font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']<>'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td> | 280 | |
| 1682 | 304 | <td><para style="P3"><font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font> </para></td> | 281 | <td><para style="P14"><font>[[ a['type']<>'view' and removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['name'] ]]</font><b>[[ a['type']<>'view' and removeParentNode('font') ]] [[a['name'] ]]</b></para></td> |
| 1683 | 305 | <td><para style="P3"><font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</font><font>[[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</font> </para></td> | 282 | |
| 1684 | 283 | <td><para style="P3"><font>[[ a['type']<>'view' and removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><b>[[ a['type']<>'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</b></para></td> | ||
| 1685 | 284 | |||
| 1686 | 285 | <td><para style="P3"><font>[[ a['type']<>'view' and removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><b>[[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</b></para></td> | ||
| 1687 | 286 | |||
| 1688 | 287 | <td><para style="P3"><font>[[ a['type']<>'view' and removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</font><b>[[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</b></para></td> | ||
| 1689 | 306 | </tr> | 288 | </tr> |
| 1690 | 307 | </blockTable> | 289 | </blockTable> |
| 1691 | 308 | <para style="P11"> | 290 | <para style="P11"> |
| 1692 | 309 | 291 | ||
| 1693 | === modified file 'account/report/account_central_journal.rml' | |||
| 1694 | --- account/report/account_central_journal.rml 2011-12-21 09:08:11 +0000 | |||
| 1695 | +++ account/report/account_central_journal.rml 2013-08-13 05:40:59 +0000 | |||
| 1696 | @@ -189,38 +189,27 @@ | |||
| 1697 | 189 | <initialize> | 189 | <initialize> |
| 1698 | 190 | <paraStyle name="all" alignment="justify"/> | 190 | <paraStyle name="all" alignment="justify"/> |
| 1699 | 191 | </initialize> | 191 | </initialize> |
| 1732 | 192 | <paraStyle name="Standard" fontName="Times-Roman"/> | 192 | <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1733 | 193 | <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 193 | <paraStyle name="P9" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1734 | 194 | <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 194 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1735 | 195 | <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 195 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1736 | 196 | <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 196 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1737 | 197 | <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 197 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1738 | 198 | <paraStyle name="Index" fontName="Times-Roman"/> | 198 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1739 | 199 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 199 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1740 | 200 | <paraStyle name="Footer" fontName="Times-Roman"/> | 200 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1741 | 201 | <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 201 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1742 | 202 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 202 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1743 | 203 | <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 203 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1744 | 204 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 204 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1745 | 205 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 205 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1746 | 206 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 206 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1747 | 207 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 207 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1748 | 208 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 208 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1749 | 209 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 209 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1750 | 210 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 210 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1751 | 211 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 211 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1752 | 212 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 212 | <paraStyle name="terp_default_Bold_9_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1721 | 213 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1722 | 214 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1723 | 215 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1724 | 216 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 1725 | 217 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1726 | 218 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1727 | 219 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1728 | 220 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1729 | 221 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1730 | 222 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1731 | 223 | <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 1753 | 224 | </stylesheet> | 213 | </stylesheet> |
| 1754 | 225 | <images/> | 214 | <images/> |
| 1755 | 226 | <story> | 215 | <story> |
| 1756 | @@ -229,17 +218,17 @@ | |||
| 1757 | 229 | <tr> | 218 | <tr> |
| 1758 | 230 | <td><para style="terp_header"><font color="white"> </font></para> | 219 | <td><para style="terp_header"><font color="white"> </font></para> |
| 1759 | 231 | </td> | 220 | </td> |
| 1761 | 232 | <td><para style="terp_header_Centre">Centralized Journal</para></td> | 221 | <td><para style="terp_header_Centre"><b>Centralized Journal</b></para></td> |
| 1762 | 233 | <td><para style="terp_header"><font color="white"> </font></para></td> | 222 | <td><para style="terp_header"><font color="white"> </font></para></td> |
| 1763 | 234 | </tr> | 223 | </tr> |
| 1764 | 235 | </blockTable> | 224 | </blockTable> |
| 1765 | 236 | <blockTable colWidths="130.0,80.0,100.0,130.0,100.0" style="Table2"> | 225 | <blockTable colWidths="130.0,80.0,100.0,130.0,100.0" style="Table2"> |
| 1766 | 237 | <tr> | 226 | <tr> |
| 1772 | 238 | <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td> | 227 | <td><para style="terp_tblheader_General_Centre"><b>Chart of Accounts</b></para></td> |
| 1773 | 239 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> | 228 | <td><para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para></td> |
| 1774 | 240 | <td><para style="terp_tblheader_General_Centre">Journal</para></td> | 229 | <td><para style="terp_tblheader_General_Centre"><b>Journal</b></para></td> |
| 1775 | 241 | <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td> | 230 | <td><para style="terp_tblheader_General_Centre"><b>Filter By</b> [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td> |
| 1776 | 242 | <td><para style="terp_tblheader_General_Centre">Target Moves</para></td> | 231 | <td><para style="terp_tblheader_General_Centre"><b>Target Moves</b></para></td> |
| 1777 | 243 | </tr> | 232 | </tr> |
| 1778 | 244 | <tr> | 233 | <tr> |
| 1779 | 245 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> | 234 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> |
| 1780 | @@ -248,8 +237,8 @@ | |||
| 1781 | 248 | <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para> | 237 | <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para> |
| 1782 | 249 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] | 238 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] |
| 1783 | 250 | <tr> | 239 | <tr> |
| 1786 | 251 | <td><para style="terp_tblheader_Details_Centre">Start Date</para></td> | 240 | <td><para style="terp_tblheader_Details_Centre"><b>Start Date</b></para></td> |
| 1787 | 252 | <td><para style="terp_tblheader_Details_Centre">End Date</para></td> | 241 | <td><para style="terp_tblheader_Details_Centre"><b>End Date</b></para></td> |
| 1788 | 253 | </tr> | 242 | </tr> |
| 1789 | 254 | <tr> | 243 | <tr> |
| 1790 | 255 | <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td> | 244 | <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td> |
| 1791 | @@ -258,8 +247,8 @@ | |||
| 1792 | 258 | </blockTable> | 247 | </blockTable> |
| 1793 | 259 | <blockTable colWidths="65.0,65.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] | 248 | <blockTable colWidths="65.0,65.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] |
| 1794 | 260 | <tr> | 249 | <tr> |
| 1797 | 261 | <td><para style="terp_tblheader_Details_Centre">Start Period</para></td> | 250 | <td><para style="terp_tblheader_Details_Centre"><b>Start Period</b></para></td> |
| 1798 | 262 | <td><para style="terp_tblheader_Details_Centre">End Period</para></td> | 251 | <td><para style="terp_tblheader_Details_Centre"><b>End Period</b></para></td> |
| 1799 | 263 | </tr> | 252 | </tr> |
| 1800 | 264 | <tr> | 253 | <tr> |
| 1801 | 265 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td> | 254 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td> |
| 1802 | @@ -275,39 +264,39 @@ | |||
| 1803 | 275 | </para> | 264 | </para> |
| 1804 | 276 | <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]] | 265 | <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]] |
| 1805 | 277 | <tr> | 266 | <tr> |
| 1811 | 278 | <td><para style="terp_tblheader_Details">A/C No.</para></td> | 267 | <td><para style="terp_tblheader_Details"><b>A/C No.</b></para></td> |
| 1812 | 279 | <td><para style="terp_tblheader_Details">Account Name</para></td> | 268 | <td><para style="terp_tblheader_Details"><b>Account Name</b></para></td> |
| 1813 | 280 | <td><para style="terp_tblheader_Details_Right">Debit</para></td> | 269 | <td><para style="terp_tblheader_Details_Right"><b>Debit</b></para></td> |
| 1814 | 281 | <td><para style="terp_tblheader_Details_Right">Credit</para></td> | 270 | <td><para style="terp_tblheader_Details_Right"><b>Credit</b></para></td> |
| 1815 | 282 | <td><para style="terp_tblheader_Details_Right">Balance</para></td> | 271 | <td><para style="terp_tblheader_Details_Right"><b>Balance</b></para></td> |
| 1816 | 283 | </tr> | 272 | </tr> |
| 1817 | 284 | </blockTable> | 273 | </blockTable> |
| 1818 | 285 | <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]] | 274 | <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]] |
| 1819 | 286 | <tr> | 275 | <tr> |
| 1826 | 287 | <td><para style="terp_tblheader_Details">A/C No.</para></td> | 276 | <td><para style="terp_tblheader_Details"><b>A/C No.</b></para></td> |
| 1827 | 288 | <td><para style="terp_tblheader_Details">Account Name</para></td> | 277 | <td><para style="terp_tblheader_Details"><b>Account Name</b></para></td> |
| 1828 | 289 | <td><para style="terp_tblheader_Details_Right">Debit</para></td> | 278 | <td><para style="terp_tblheader_Details_Right"><b>Debit</b></para></td> |
| 1829 | 290 | <td><para style="terp_tblheader_Details_Right">Credit</para></td> | 279 | <td><para style="terp_tblheader_Details_Right"><b>Credit</b></para></td> |
| 1830 | 291 | <td><para style="terp_tblheader_Details_Right">Balance</para></td> | 280 | <td><para style="terp_tblheader_Details_Right"><b>Balance</b></para></td> |
| 1831 | 292 | <td><para style="terp_tblheader_Details_Right">Currency</para></td> | 281 | <td><para style="terp_tblheader_Details_Right"><b>Currency</b></para></td> |
| 1832 | 293 | </tr> | 282 | </tr> |
| 1833 | 294 | </blockTable> | 283 | </blockTable> |
| 1834 | 295 | <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]] | 284 | <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]] |
| 1835 | 296 | <tr> | 285 | <tr> |
| 1837 | 297 | <td><para style="terp_default_Bold_9">Total:</para></td> | 286 | <td><para style="terp_default_Bold_9"><b>Total:</b></para></td> |
| 1838 | 298 | <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> | 287 | <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> |
| 1842 | 299 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] </para></td> | 288 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] </b></para></td> |
| 1843 | 300 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] </para></td> | 289 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] </b></para></td> |
| 1844 | 301 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id ) ]]</para></td> | 290 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id ) ]]</b></para></td> |
| 1845 | 302 | </tr> | 291 | </tr> |
| 1846 | 303 | </blockTable> | 292 | </blockTable> |
| 1847 | 304 | <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]] | 293 | <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]] |
| 1848 | 305 | <tr> | 294 | <tr> |
| 1850 | 306 | <td><para style="terp_default_Bold_9">Total:</para></td> | 295 | <td><para style="terp_default_Bold_9"><b>Total:</b></para></td> |
| 1851 | 307 | <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> | 296 | <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> |
| 1855 | 308 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para></td> | 297 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</b></para></td> |
| 1856 | 309 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para></td> | 298 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</b></para></td> |
| 1857 | 310 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id ) ]]</para></td> | 299 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id ) ]]</b></para></td> |
| 1858 | 311 | <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> | 300 | <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> |
| 1859 | 312 | </tr> | 301 | </tr> |
| 1860 | 313 | </blockTable> | 302 | </blockTable> |
| 1861 | 314 | 303 | ||
| 1862 | === modified file 'account/report/account_financial_report.rml' | |||
| 1863 | --- account/report/account_financial_report.rml 2013-06-14 21:36:02 +0000 | |||
| 1864 | +++ account/report/account_financial_report.rml 2013-08-13 05:40:59 +0000 | |||
| 1865 | @@ -91,54 +91,54 @@ | |||
| 1866 | 91 | <initialize> | 91 | <initialize> |
| 1867 | 92 | <paraStyle name="all" alignment="justify"/> | 92 | <paraStyle name="all" alignment="justify"/> |
| 1868 | 93 | </initialize> | 93 | </initialize> |
| 1902 | 94 | <paraStyle name="P1" rightIndent="2.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 94 | <paraStyle name="P1" rightIndent="2.0" leftIndent="0.0" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1903 | 95 | <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 95 | <paraStyle name="P2" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1904 | 96 | <paraStyle name="Standard" fontName="Times-Roman"/> | 96 | <paraStyle name="Standard" /> |
| 1905 | 97 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 97 | <paraStyle name="Heading" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1906 | 98 | <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 98 | <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1907 | 99 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 99 | <paraStyle name="List" spaceBefore="0.0" spaceAfter="6.0"/> |
| 1908 | 100 | <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/> | 100 | <paraStyle name="Caption" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1909 | 101 | <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/> | 101 | <paraStyle name="Index" fontSize="9.0" leading="11"/> |
| 1910 | 102 | <paraStyle name="Footer" fontName="Times-Roman"/> | 102 | <paraStyle name="Footer" /> |
| 1911 | 103 | <paraStyle name="Table Contents" fontName="Times-Roman"/> | 103 | <paraStyle name="Table Contents" /> |
| 1912 | 104 | <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/> | 104 | <paraStyle name="Table Heading" alignment="CENTER"/> |
| 1913 | 105 | <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 105 | <paraStyle name="Horizontal Line" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> |
| 1914 | 106 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 106 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1915 | 107 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 107 | <paraStyle name="Heading 9" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1916 | 108 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 108 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1917 | 109 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 109 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1918 | 110 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 110 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1919 | 111 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 111 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1920 | 112 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 112 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1921 | 113 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 113 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1922 | 114 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 114 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1923 | 115 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 115 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 1924 | 116 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 116 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1925 | 117 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 117 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1926 | 118 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 118 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1927 | 119 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | 119 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 1928 | 120 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 120 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1929 | 121 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 121 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1930 | 122 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 122 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1931 | 123 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 123 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1932 | 124 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 124 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1933 | 125 | <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 125 | <paraStyle name="terp_default_Right_9_Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1934 | 126 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 126 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1935 | 127 | 127 | ||
| 1950 | 128 | <paraStyle name="terp_level_0_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 128 | <paraStyle name="terp_level_0_name" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1951 | 129 | <paraStyle name="terp_level_0_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 129 | <paraStyle name="terp_level_0_balance" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1952 | 130 | <paraStyle name="terp_level_1_name" fontName="Helvetica-Bold" fontSize="10.0" alignment="LEFT" leading="20" spaceBefore="0.0" spaceAfter="0.0"/> | 130 | <paraStyle name="terp_level_1_name" fontSize="10.0" alignment="LEFT" leading="20" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1953 | 131 | <paraStyle name="terp_level_1_balance" fontName="Helvetica-Bold" fontSize="10.0" alignment="RIGHT" leading="20" spaceBefore="0.0" spaceAfter="0.0"/> | 131 | <paraStyle name="terp_level_1_balance" fontSize="10.0" alignment="RIGHT" leading="20" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1954 | 132 | <paraStyle name="terp_level_2_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 132 | <paraStyle name="terp_level_2_name" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1955 | 133 | <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 133 | <paraStyle name="terp_level_2_balance" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1956 | 134 | <paraStyle name="terp_level_3_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 134 | <paraStyle name="terp_level_3_name" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1957 | 135 | <paraStyle name="terp_level_3_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 135 | <paraStyle name="terp_level_3_balance" fontSize="8.0" leftIndent="10.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1958 | 136 | <paraStyle name="terp_level_4_name" fontName="Helvetica" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 136 | <paraStyle name="terp_level_4_name" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1959 | 137 | <paraStyle name="terp_level_4_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 137 | <paraStyle name="terp_level_4_balance" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1960 | 138 | <paraStyle name="terp_level_5_name" fontName="Helvetica-Oblique" fontSize="7.5" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 138 | <paraStyle name="terp_level_5_name" fontSize="7.5" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1961 | 139 | <paraStyle name="terp_level_5_balance" fontName="Helvetica-Oblique" fontSize="7.5" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 139 | <paraStyle name="terp_level_5_balance" fontSize="7.5" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1962 | 140 | <paraStyle name="terp_level_6_name" fontName="Helvetica" fontSize="6.5" leftIndent="40.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 140 | <paraStyle name="terp_level_6_name" fontSize="6.5" leftIndent="40.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1963 | 141 | <paraStyle name="terp_level_6_balance" fontName="Helvetica" fontSize="6.5" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 141 | <paraStyle name="terp_level_6_balance" fontSize="6.5" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 1964 | 142 | 142 | ||
| 1965 | 143 | <blockTableStyle id="Table1"> | 143 | <blockTableStyle id="Table1"> |
| 1966 | 144 | <blockTopPadding start="0,0" stop="-1,0" length="10"/> | 144 | <blockTopPadding start="0,0" stop="-1,0" length="10"/> |
| 1967 | @@ -158,7 +158,7 @@ | |||
| 1968 | 158 | <blockTable colWidths="539.0" style="Table_Company_Name"> | 158 | <blockTable colWidths="539.0" style="Table_Company_Name"> |
| 1969 | 159 | <tr> | 159 | <tr> |
| 1970 | 160 | <td> | 160 | <td> |
| 1972 | 161 | <para style="terp_header_Centre">[[ data['form']['account_report_id'][1] ]]</para> | 161 | <para style="terp_header_Centre"><b>[[ data['form']['account_report_id'][1] ]]</b></para> |
| 1973 | 162 | </td> | 162 | </td> |
| 1974 | 163 | </tr> | 163 | </tr> |
| 1975 | 164 | </blockTable> | 164 | </blockTable> |
| 1976 | @@ -168,9 +168,9 @@ | |||
| 1977 | 168 | </para> | 168 | </para> |
| 1978 | 169 | <blockTable colWidths="163.0,163.0,163.0" style="Table2_header"> | 169 | <blockTable colWidths="163.0,163.0,163.0" style="Table2_header"> |
| 1979 | 170 | <tr> | 170 | <tr> |
| 1983 | 171 | <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td> | 171 | <td><para style="terp_tblheader_General_Centre"><b>Chart of Accounts</b></para></td> |
| 1984 | 172 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> | 172 | <td><para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para></td> |
| 1985 | 173 | <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td> | 173 | <td><para style="terp_tblheader_General_Centre"><b>Filter By </b>[[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td> |
| 1986 | 174 | </tr> | 174 | </tr> |
| 1987 | 175 | <tr> | 175 | <tr> |
| 1988 | 176 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> | 176 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> |
| 1989 | @@ -178,8 +178,8 @@ | |||
| 1990 | 178 | <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filters' and get_filter(data) or removeParentNode('para') ]] </para> | 178 | <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filters' and get_filter(data) or removeParentNode('para') ]] </para> |
| 1991 | 179 | <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] | 179 | <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] |
| 1992 | 180 | <tr> | 180 | <tr> |
| 1995 | 181 | <td><para style="terp_tblheader_General_Centre">Start Date</para></td> | 181 | <td><para style="terp_tblheader_General_Centre"><b>Start Date</b></para></td> |
| 1996 | 182 | <td><para style="terp_tblheader_General_Centre">End Date</para></td> | 182 | <td><para style="terp_tblheader_General_Centre"><b>End Date</b></para></td> |
| 1997 | 183 | </tr> | 183 | </tr> |
| 1998 | 184 | <tr> | 184 | <tr> |
| 1999 | 185 | <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td> | 185 | <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td> |
| 2000 | @@ -188,8 +188,8 @@ | |||
| 2001 | 188 | </blockTable> | 188 | </blockTable> |
| 2002 | 189 | <blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] | 189 | <blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] |
| 2003 | 190 | <tr> | 190 | <tr> |
| 2006 | 191 | <td><para style="terp_tblheader_General_Centre">Start Period</para></td> | 191 | <td><para style="terp_tblheader_General_Centre"><b>Start Period</b></para></td> |
| 2007 | 192 | <td><para style="terp_tblheader_General_Centre">End Period</para></td> | 192 | <td><para style="terp_tblheader_General_Centre"><b>End Period</b></para></td> |
| 2008 | 193 | </tr> | 193 | </tr> |
| 2009 | 194 | <tr> | 194 | <tr> |
| 2010 | 195 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td> | 195 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td> |
| 2011 | @@ -210,16 +210,16 @@ | |||
| 2012 | 210 | [[ data['form']['debit_credit'] == 1 or removeParentNode('blockTable') ]] | 210 | [[ data['form']['debit_credit'] == 1 or removeParentNode('blockTable') ]] |
| 2013 | 211 | <tr> | 211 | <tr> |
| 2014 | 212 | <td> | 212 | <td> |
| 2016 | 213 | <para style="terp_default_Bold_9">Name</para> | 213 | <para style="terp_default_Bold_9"><b>Name</b></para> |
| 2017 | 214 | </td> | 214 | </td> |
| 2018 | 215 | <td> | 215 | <td> |
| 2020 | 216 | <para style="terp_tblheader_Details_Right">Debit</para> | 216 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 2021 | 217 | </td> | 217 | </td> |
| 2022 | 218 | <td> | 218 | <td> |
| 2024 | 219 | <para style="terp_tblheader_Details_Right">Credit</para> | 219 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 2025 | 220 | </td> | 220 | </td> |
| 2026 | 221 | <td> | 221 | <td> |
| 2028 | 222 | <para style="terp_tblheader_Details_Right">Balance</para> | 222 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 2029 | 223 | </td> | 223 | </td> |
| 2030 | 224 | </tr> | 224 | </tr> |
| 2031 | 225 | <tr style="Table3"> | 225 | <tr style="Table3"> |
| 2032 | @@ -241,10 +241,10 @@ | |||
| 2033 | 241 | [[ (not data['form']['enable_filter'] and not data['form']['debit_credit']) or removeParentNode('blockTable') ]] | 241 | [[ (not data['form']['enable_filter'] and not data['form']['debit_credit']) or removeParentNode('blockTable') ]] |
| 2034 | 242 | <tr> | 242 | <tr> |
| 2035 | 243 | <td> | 243 | <td> |
| 2037 | 244 | <para style="terp_default_Bold_9">Name</para> | 244 | <para style="terp_default_Bold_9"><b>Name</b></para> |
| 2038 | 245 | </td> | 245 | </td> |
| 2039 | 246 | <td> | 246 | <td> |
| 2041 | 247 | <para style="terp_tblheader_Details_Right">Balance</para> | 247 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 2042 | 248 | </td> | 248 | </td> |
| 2043 | 249 | </tr> | 249 | </tr> |
| 2044 | 250 | <tr style="Table3"> | 250 | <tr style="Table3"> |
| 2045 | @@ -267,13 +267,13 @@ | |||
| 2046 | 267 | [[ (data['form']['enable_filter'] == 1 and not data['form']['debit_credit']) or removeParentNode('blockTable') ]] | 267 | [[ (data['form']['enable_filter'] == 1 and not data['form']['debit_credit']) or removeParentNode('blockTable') ]] |
| 2047 | 268 | <tr> | 268 | <tr> |
| 2048 | 269 | <td> | 269 | <td> |
| 2056 | 270 | <para style="terp_default_Bold_9">Name</para> | 270 | <para style="terp_default_Bold_9"><b>Name</b></para> |
| 2057 | 271 | </td> | 271 | </td> |
| 2058 | 272 | <td> | 272 | <td> |
| 2059 | 273 | <para style="terp_tblheader_Details_Right">Balance</para> | 273 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 2060 | 274 | </td> | 274 | </td> |
| 2061 | 275 | <td> | 275 | <td> |
| 2062 | 276 | <para style="terp_tblheader_Details_Right">[[ data['form']['label_filter'] ]]</para> | 276 | <para style="terp_tblheader_Details_Right"><b>[[ data['form']['label_filter'] ]]</b></para> |
| 2063 | 277 | </td> | 277 | </td> |
| 2064 | 278 | </tr> | 278 | </tr> |
| 2065 | 279 | <tr style="Table3"> | 279 | <tr style="Table3"> |
| 2066 | 280 | 280 | ||
| 2067 | === modified file 'account/report/account_general_journal.rml' | |||
| 2068 | --- account/report/account_general_journal.rml 2013-06-14 21:36:02 +0000 | |||
| 2069 | +++ account/report/account_general_journal.rml 2013-08-13 05:40:59 +0000 | |||
| 2070 | @@ -164,38 +164,28 @@ | |||
| 2071 | 164 | <initialize> | 164 | <initialize> |
| 2072 | 165 | <paraStyle name="all" alignment="justify"/> | 165 | <paraStyle name="all" alignment="justify"/> |
| 2073 | 166 | </initialize> | 166 | </initialize> |
| 2106 | 167 | <paraStyle name="Standard" fontName="Times-Roman"/> | 167 | <paraStyle name="Standard" /> |
| 2107 | 168 | <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 168 | <paraStyle name="P9" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 2108 | 169 | <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 169 | <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 2109 | 170 | <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 170 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2110 | 171 | <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 171 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2111 | 172 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 172 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2112 | 173 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 173 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2113 | 174 | <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/> | 174 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2114 | 175 | <paraStyle name="Index" fontName="Helvetica"/> | 175 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2115 | 176 | <paraStyle name="Footer" fontName="Times-Roman"/> | 176 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2116 | 177 | <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 177 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2117 | 178 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 178 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2118 | 179 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 179 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2119 | 180 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 180 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 2120 | 181 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 181 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 2121 | 182 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 182 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2122 | 183 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 183 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2123 | 184 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 184 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2124 | 185 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 185 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2125 | 186 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 186 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2126 | 187 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 187 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2127 | 188 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 188 | <paraStyle name="terp_default_Bold_9_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2096 | 189 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2097 | 190 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 2098 | 191 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 2099 | 192 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2100 | 193 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2101 | 194 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2102 | 195 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2103 | 196 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2104 | 197 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2105 | 198 | <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2128 | 199 | </stylesheet> | 189 | </stylesheet> |
| 2129 | 200 | <images/> | 190 | <images/> |
| 2130 | 201 | <story> | 191 | <story> |
| 2131 | @@ -209,7 +199,8 @@ | |||
| 2132 | 209 | </para> | 199 | </para> |
| 2133 | 210 | </td> | 200 | </td> |
| 2134 | 211 | <td> | 201 | <td> |
| 2136 | 212 | <para style="terp_header_Centre">General Journal</para> | 202 | <para style="terp_header_Centre"><b>General Journal</b></para> |
| 2137 | 203 | <para style="terp_default_8"><font color="white"> </font></para> | ||
| 2138 | 213 | </td> | 204 | </td> |
| 2139 | 214 | <td> | 205 | <td> |
| 2140 | 215 | <para style="terp_header"> | 206 | <para style="terp_header"> |
| 2141 | @@ -220,12 +211,12 @@ | |||
| 2142 | 220 | </blockTable> | 211 | </blockTable> |
| 2143 | 221 | <blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2"> | 212 | <blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2"> |
| 2144 | 222 | <tr> | 213 | <tr> |
| 2151 | 223 | <td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period' and ' ' or removeParentNode('para') ]]</para> | 214 | <td><para style="terp_tblheader_General_Centre"><b>Company[[ data['model']=='account.journal.period' and ' ' or removeParentNode('para') ]]</b></para> |
| 2152 | 224 | <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td> | 215 | <para style="terp_tblheader_General_Centre"><b>Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</b></para></td> |
| 2153 | 225 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> | 216 | <td><para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para></td> |
| 2154 | 226 | <td><para style="terp_tblheader_General_Centre">Journals</para></td> | 217 | <td><para style="terp_tblheader_General_Centre"><b>Journals</b></para></td> |
| 2155 | 227 | <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td> | 218 | <td><para style="terp_tblheader_General_Centre"><b>Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</b></para></td> |
| 2156 | 228 | <td><para style="terp_tblheader_General_Centre">Target Moves</para></td> | 219 | <td><para style="terp_tblheader_General_Centre"><b>Target Moves</b></para></td> |
| 2157 | 229 | </tr> | 220 | </tr> |
| 2158 | 230 | <tr> | 221 | <tr> |
| 2159 | 231 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> | 222 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> |
| 2160 | @@ -234,8 +225,8 @@ | |||
| 2161 | 234 | <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para> | 225 | <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para> |
| 2162 | 235 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] | 226 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] |
| 2163 | 236 | <tr> | 227 | <tr> |
| 2166 | 237 | <td><para style="terp_tblheader_Details_Centre">Start Date</para></td> | 228 | <td><para style="terp_tblheader_Details_Centre"><b>Start Date</b></para></td> |
| 2167 | 238 | <td><para style="terp_tblheader_Details_Centre">End Date</para></td> | 229 | <td><para style="terp_tblheader_Details_Centre"><b>End Date</b></para></td> |
| 2168 | 239 | </tr> | 230 | </tr> |
| 2169 | 240 | <tr> | 231 | <tr> |
| 2170 | 241 | <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True)]]</para></td> | 232 | <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True)]]</para></td> |
| 2171 | @@ -244,8 +235,8 @@ | |||
| 2172 | 244 | </blockTable> | 235 | </blockTable> |
| 2173 | 245 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] | 236 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] |
| 2174 | 246 | <tr> | 237 | <tr> |
| 2177 | 247 | <td><para style="terp_tblheader_Details_Centre">Start Period</para></td> | 238 | <td><para style="terp_tblheader_Details_Centre"><b>Start Period</b></para></td> |
| 2178 | 248 | <td><para style="terp_tblheader_Details_Centre">End Period</para></td> | 239 | <td><para style="terp_tblheader_Details_Centre"><b>End Period</b></para></td> |
| 2179 | 249 | </tr> | 240 | </tr> |
| 2180 | 250 | <tr> | 241 | <tr> |
| 2181 | 251 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td> | 242 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td> |
| 2182 | @@ -262,35 +253,35 @@ | |||
| 2183 | 262 | </para> | 253 | </para> |
| 2184 | 263 | <blockTable colWidths="100.0,125.0,90.0,100.0,100.0" style="Table_Journal_Title" repeatRows="1"><para>[[ display_currency(data)==False or removeParentNode('blockTable') ]]</para> | 254 | <blockTable colWidths="100.0,125.0,90.0,100.0,100.0" style="Table_Journal_Title" repeatRows="1"><para>[[ display_currency(data)==False or removeParentNode('blockTable') ]]</para> |
| 2185 | 264 | <tr> | 255 | <tr> |
| 2191 | 265 | <td><para style="terp_tblheader_Details">Code</para></td> | 256 | <td><para style="terp_tblheader_Details"><b>Code</b></para></td> |
| 2192 | 266 | <td><para style="terp_tblheader_Details">Journal Name</para></td> | 257 | <td><para style="terp_tblheader_Details"><b>Journal Name</b></para></td> |
| 2193 | 267 | <td><para style="terp_tblheader_Details_Right">Debit</para></td> | 258 | <td><para style="terp_tblheader_Details_Right"><b>Debit</b></para></td> |
| 2194 | 268 | <td><para style="terp_tblheader_Details_Right">Credit</para></td> | 259 | <td><para style="terp_tblheader_Details_Right"><b>Credit</b></para></td> |
| 2195 | 269 | <td><para style="terp_tblheader_Details_Right">Balance</para></td> | 260 | <td><para style="terp_tblheader_Details_Right"><b>Balance</b></para></td> |
| 2196 | 270 | </tr> | 261 | </tr> |
| 2197 | 271 | <tr> | 262 | <tr> |
| 2203 | 272 | <td><para style="terp_default_Bold_9">Total:</para></td> | 263 | <td><para style="terp_default_Bold_9"><b>Total:</b></para></td> |
| 2204 | 273 | <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> | 264 | <td><para style="terp_default_Bold_9"><font color="white"></font></para></td> |
| 2205 | 274 | <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]] </para></td> | 265 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_debit()) ]] </b></para></td> |
| 2206 | 275 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td> | 266 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_credit()) ]]</b></para></td> |
| 2207 | 276 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit()- sum_credit(), currency_obj=company.currency_id) ]]</para></td> | 267 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_debit()- sum_credit(), currency_obj=company.currency_id) ]]</b></para></td> |
| 2208 | 277 | </tr> | 268 | </tr> |
| 2209 | 278 | </blockTable> | 269 | </blockTable> |
| 2210 | 279 | <blockTable colWidths="100.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Title" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]] | 270 | <blockTable colWidths="100.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Title" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]] |
| 2211 | 280 | <tr> | 271 | <tr> |
| 2218 | 281 | <td><para style="terp_tblheader_Details">Code</para></td> | 272 | <td><para style="terp_tblheader_Details"><b>Code</b></para></td> |
| 2219 | 282 | <td><para style="terp_tblheader_Details">Journal Name</para></td> | 273 | <td><para style="terp_tblheader_Details"><b>Journal Name</b></para></td> |
| 2220 | 283 | <td><para style="terp_tblheader_Details_Right">Debit</para></td> | 274 | <td><para style="terp_tblheader_Details_Right"><b>Debit</b></para></td> |
| 2221 | 284 | <td><para style="terp_tblheader_Details_Right">Credit</para></td> | 275 | <td><para style="terp_tblheader_Details_Right"><b>Credit</b></para></td> |
| 2222 | 285 | <td><para style="terp_tblheader_Details_Right">Balance</para></td> | 276 | <td><para style="terp_tblheader_Details_Right"><b>Balance</b></para></td> |
| 2223 | 286 | <td><para style="terp_tblheader_Details_Right">Currency</para></td> | 277 | <td><para style="terp_tblheader_Details_Right"><b>Currency</b></para></td> |
| 2224 | 287 | </tr> | 278 | </tr> |
| 2225 | 288 | <tr> | 279 | <tr> |
| 2226 | 289 | <td><para style="terp_default_Bold_9">Total:</para></td> | 280 | <td><para style="terp_default_Bold_9">Total:</para></td> |
| 2227 | 290 | <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> | 281 | <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td> |
| 2231 | 291 | <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para></td> | 282 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_debit()) ]]</b></para></td> |
| 2232 | 292 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td> | 283 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_credit()) ]]</b></para></td> |
| 2233 | 293 | <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()- sum_debit(), currency_obj=company.currency_id) ]]</para></td> | 284 | <td><para style="terp_default_Bold_9_Right"><b>[[ formatLang( sum_credit()- sum_debit(), currency_obj=company.currency_id) ]]</b></para></td> |
| 2234 | 294 | </tr> | 285 | </tr> |
| 2235 | 295 | </blockTable> | 286 | </blockTable> |
| 2236 | 296 | 287 | ||
| 2237 | @@ -298,20 +289,20 @@ | |||
| 2238 | 298 | <blockTable colWidths="100.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Title">[[ display_currency(data) or removeParentNode('blockTable') ]] | 289 | <blockTable colWidths="100.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Title">[[ display_currency(data) or removeParentNode('blockTable') ]] |
| 2239 | 299 | <tr> | 290 | <tr> |
| 2240 | 300 | <td> | 291 | <td> |
| 2242 | 301 | <para style="terp_default_Bold_9">[[ o.name ]] :</para> | 292 | <para style="terp_default_Bold_9"><b>[[ o.name ]]</b> :</para> |
| 2243 | 302 | </td> | 293 | </td> |
| 2244 | 303 | <td> | 294 | <td> |
| 2245 | 304 | <para style="terp_default_Bold_9"> | 295 | <para style="terp_default_Bold_9"> |
| 2246 | 305 | </para> | 296 | </para> |
| 2247 | 306 | </td> | 297 | </td> |
| 2248 | 307 | <td> | 298 | <td> |
| 2256 | 308 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.id)) ]]</para> | 299 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_debit_period(o.id)) ]]</b></para> |
| 2257 | 309 | </td> | 300 | </td> |
| 2258 | 310 | <td> | 301 | <td> |
| 2259 | 311 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)) ]]</para> | 302 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_credit_period(o.id)) ]]</b></para> |
| 2260 | 312 | </td> | 303 | </td> |
| 2261 | 313 | <td> | 304 | <td> |
| 2262 | 314 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id), currency_obj=company.currency_id) ]] </para> | 305 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id), currency_obj=company.currency_id) ]]</b> </para> |
| 2263 | 315 | 306 | ||
| 2264 | 316 | </td> | 307 | </td> |
| 2265 | 317 | <td> | 308 | <td> |
| 2266 | @@ -324,20 +315,20 @@ | |||
| 2267 | 324 | <blockTable colWidths="100.0,125.0,90.0,100.0,100.0" style="Table_Journal_Title">[[ display_currency(data)==False or removeParentNode('blockTable') ]] | 315 | <blockTable colWidths="100.0,125.0,90.0,100.0,100.0" style="Table_Journal_Title">[[ display_currency(data)==False or removeParentNode('blockTable') ]] |
| 2268 | 325 | <tr> | 316 | <tr> |
| 2269 | 326 | <td> | 317 | <td> |
| 2271 | 327 | <para style="terp_default_Bold_9">[[ o.name ]] :</para> | 318 | <para style="terp_default_Bold_9"><b>[[ o.name ]]</b> :</para> |
| 2272 | 328 | </td> | 319 | </td> |
| 2273 | 329 | <td> | 320 | <td> |
| 2274 | 330 | <para style="terp_default_Bold_9"> | 321 | <para style="terp_default_Bold_9"> |
| 2275 | 331 | </para> | 322 | </para> |
| 2276 | 332 | </td> | 323 | </td> |
| 2277 | 333 | <td> | 324 | <td> |
| 2285 | 334 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.id)) ]] </para> | 325 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_debit_period(o.id)) ]]</b> </para> |
| 2286 | 335 | </td> | 326 | </td> |
| 2287 | 336 | <td> | 327 | <td> |
| 2288 | 337 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)) ]] </para> | 328 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_credit_period(o.id)) ]]</b> </para> |
| 2289 | 338 | </td> | 329 | </td> |
| 2290 | 339 | <td> | 330 | <td> |
| 2291 | 340 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id), currency_obj=company.currency_id) ]]</para> | 331 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id), currency_obj=company.currency_id) ]]</b></para> |
| 2292 | 341 | </td> | 332 | </td> |
| 2293 | 342 | </tr> | 333 | </tr> |
| 2294 | 343 | </blockTable> | 334 | </blockTable> |
| 2295 | 344 | 335 | ||
| 2296 | === modified file 'account/report/account_general_ledger.rml' | |||
| 2297 | --- account/report/account_general_ledger.rml 2012-06-13 09:06:00 +0000 | |||
| 2298 | +++ account/report/account_general_ledger.rml 2013-08-13 05:40:59 +0000 | |||
| 2299 | @@ -227,38 +227,27 @@ | |||
| 2300 | 227 | <initialize> | 227 | <initialize> |
| 2301 | 228 | <paraStyle name="all" alignment="justify"/> | 228 | <paraStyle name="all" alignment="justify"/> |
| 2302 | 229 | </initialize> | 229 | </initialize> |
| 2335 | 230 | <paraStyle name="Standard" fontName="Helvetica"/> | 230 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 2336 | 231 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 231 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2337 | 232 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 232 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2338 | 233 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 233 | <paraStyle name="terp_default_8" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2339 | 234 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 234 | <paraStyle name="terp_default_Bold_8" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2340 | 235 | <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 235 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2341 | 236 | <paraStyle name="Index" fontName="Helvetica"/> | 236 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2342 | 237 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 237 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2343 | 238 | <paraStyle name="Footer" fontName="Helvetica"/> | 238 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2344 | 239 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 239 | <paraStyle name="terp_default_Right_8" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2345 | 240 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 240 | <paraStyle name="terp_default_Centre_8" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2346 | 241 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 241 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 2347 | 242 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 242 | <paraStyle name="terp_header_Centre" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 2348 | 243 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 243 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2349 | 244 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 244 | <paraStyle name="terp_default_9" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2350 | 245 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 245 | <paraStyle name="terp_default_Bold_9" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2351 | 246 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 246 | <paraStyle name="terp_default_Centre_9" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2352 | 247 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 247 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2353 | 248 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 248 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2354 | 249 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 249 | <paraStyle name="terp_default_Right_Bold_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2355 | 250 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 250 | <paraStyle name="terp_default_Bold_9_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2324 | 251 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2325 | 252 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 2326 | 253 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 2327 | 254 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2328 | 255 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2329 | 256 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2330 | 257 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2331 | 258 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2332 | 259 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2333 | 260 | <paraStyle name="terp_default_Right_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2334 | 261 | <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2356 | 262 | <images/> | 251 | <images/> |
| 2357 | 263 | </stylesheet> | 252 | </stylesheet> |
| 2358 | 264 | <story> | 253 | <story> |
| 2359 | @@ -267,96 +256,96 @@ | |||
| 2360 | 267 | <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] | 256 | <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] |
| 2361 | 268 | <tr> | 257 | <tr> |
| 2362 | 269 | <td> | 258 | <td> |
| 2391 | 270 | <para style="terp_tblheader_Details">Date</para> | 259 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 2392 | 271 | </td> | 260 | </td> |
| 2393 | 272 | <td> | 261 | <td> |
| 2394 | 273 | <para style="terp_tblheader_Details">JRNL</para> | 262 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 2395 | 274 | </td> | 263 | </td> |
| 2396 | 275 | <td> | 264 | <td> |
| 2397 | 276 | <para style="terp_tblheader_Details">Partner</para> | 265 | <para style="terp_tblheader_Details"><b>Partner</b></para> |
| 2398 | 277 | </td> | 266 | </td> |
| 2399 | 278 | <td> | 267 | <td> |
| 2400 | 279 | <para style="terp_tblheader_Details_Centre">Ref</para> | 268 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 2401 | 280 | </td> | 269 | </td> |
| 2402 | 281 | <td> | 270 | <td> |
| 2403 | 282 | <para style="terp_tblheader_Details_Centre">Move</para> | 271 | <para style="terp_tblheader_Details_Centre"><b>Move</b></para> |
| 2404 | 283 | </td> | 272 | </td> |
| 2405 | 284 | <td> | 273 | <td> |
| 2406 | 285 | <para style="terp_tblheader_Details">Entry Label</para> | 274 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 2407 | 286 | </td> | 275 | </td> |
| 2408 | 287 | <td> | 276 | <td> |
| 2409 | 288 | <para style="terp_tblheader_Details_Centre">Counterpart</para> | 277 | <para style="terp_tblheader_Details_Centre"><b>Counterpart</b></para> |
| 2410 | 289 | </td> | 278 | </td> |
| 2411 | 290 | <td> | 279 | <td> |
| 2412 | 291 | <para style="terp_tblheader_Details_Right">Debit</para> | 280 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 2413 | 292 | </td> | 281 | </td> |
| 2414 | 293 | <td> | 282 | <td> |
| 2415 | 294 | <para style="terp_tblheader_Details_Right">Credit</para> | 283 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 2416 | 295 | </td> | 284 | </td> |
| 2417 | 296 | <td> | 285 | <td> |
| 2418 | 297 | <para style="terp_tblheader_Details_Right">Balance</para> | 286 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 2419 | 298 | </td> | 287 | </td> |
| 2420 | 299 | </tr> | 288 | </tr> |
| 2421 | 300 | </blockTable> | 289 | </blockTable> |
| 2422 | 301 | <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] | 290 | <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] |
| 2423 | 302 | <tr> | 291 | <tr> |
| 2424 | 303 | <td> | 292 | <td> |
| 2456 | 304 | <para style="terp_tblheader_Details">Date</para> | 293 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 2457 | 305 | </td> | 294 | </td> |
| 2458 | 306 | <td> | 295 | <td> |
| 2459 | 307 | <para style="terp_tblheader_Details">JRNL</para> | 296 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 2460 | 308 | </td> | 297 | </td> |
| 2461 | 309 | <td> | 298 | <td> |
| 2462 | 310 | <para style="terp_tblheader_Details">Partner</para> | 299 | <para style="terp_tblheader_Details"><b>Partner</b></para> |
| 2463 | 311 | </td> | 300 | </td> |
| 2464 | 312 | <td> | 301 | <td> |
| 2465 | 313 | <para style="terp_tblheader_Details_Centre">Ref</para> | 302 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 2466 | 314 | </td> | 303 | </td> |
| 2467 | 315 | <td> | 304 | <td> |
| 2468 | 316 | <para style="terp_tblheader_Details_Centre">Move</para> | 305 | <para style="terp_tblheader_Details_Centre"><b>Move</b></para> |
| 2469 | 317 | </td> | 306 | </td> |
| 2470 | 318 | <td> | 307 | <td> |
| 2471 | 319 | <para style="terp_tblheader_Details">Entry Label</para> | 308 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 2472 | 320 | </td> | 309 | </td> |
| 2473 | 321 | <td> | 310 | <td> |
| 2474 | 322 | <para style="terp_tblheader_Details_Centre">Counterpart</para> | 311 | <para style="terp_tblheader_Details_Centre"><b>Counterpart</b></para> |
| 2475 | 323 | </td> | 312 | </td> |
| 2476 | 324 | <td> | 313 | <td> |
| 2477 | 325 | <para style="terp_tblheader_Details_Right">Debit</para> | 314 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 2478 | 326 | </td> | 315 | </td> |
| 2479 | 327 | <td> | 316 | <td> |
| 2480 | 328 | <para style="terp_tblheader_Details_Right">Credit</para> | 317 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 2481 | 329 | </td> | 318 | </td> |
| 2482 | 330 | <td> | 319 | <td> |
| 2483 | 331 | <para style="terp_tblheader_Details_Right">Balance</para> | 320 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 2484 | 332 | </td> | 321 | </td> |
| 2485 | 333 | <td> | 322 | <td> |
| 2486 | 334 | <para style="terp_tblheader_Details_Right">Currency</para> | 323 | <para style="terp_tblheader_Details_Right"><b>Currency</b></para> |
| 2487 | 335 | </td> | 324 | </td> |
| 2488 | 336 | </tr> | 325 | </tr> |
| 2489 | 337 | </blockTable> | 326 | </blockTable> |
| 2490 | 338 | </pto_header> | 327 | </pto_header> |
| 2491 | 339 | <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para> | 328 | <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para> |
| 2493 | 340 | <para style="terp_header_Centre">General Ledger</para> | 329 | <para style="terp_header_Centre"><b>General Ledger</b></para> |
| 2494 | 341 | <para style="terp_default_8"> | 330 | <para style="terp_default_8"> |
| 2495 | 342 | <font color="white"> </font> | 331 | <font color="white"> </font> |
| 2496 | 343 | </para> | 332 | </para> |
| 2497 | 344 | <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13"> | 333 | <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13"> |
| 2498 | 345 | <tr> | 334 | <tr> |
| 2499 | 346 | <td> | 335 | <td> |
| 2513 | 347 | <para style="terp_tblheader_General_Centre">Chart of Accounts</para> | 336 | <para style="terp_tblheader_General_Centre"><b>Chart of Accounts</b></para> |
| 2514 | 348 | </td> | 337 | </td> |
| 2515 | 349 | <td> | 338 | <td> |
| 2516 | 350 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> | 339 | <para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para> |
| 2517 | 351 | </td> | 340 | </td> |
| 2518 | 352 | <td> | 341 | <td> |
| 2519 | 353 | <para style="terp_tblheader_General_Centre">Journals</para> | 342 | <para style="terp_tblheader_General_Centre"><b>Journals</b></para> |
| 2520 | 354 | </td> | 343 | </td> |
| 2521 | 355 | <td> | 344 | <td> |
| 2522 | 356 | <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para> | 345 | <para style="terp_tblheader_General_Centre"><b>Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</b></para> |
| 2523 | 357 | </td> | 346 | </td> |
| 2524 | 358 | <td> | 347 | <td> |
| 2525 | 359 | <para style="terp_tblheader_General_Centre">Target Moves</para> | 348 | <para style="terp_tblheader_General_Centre"><b>Target Moves</b></para> |
| 2526 | 360 | </td> | 349 | </td> |
| 2527 | 361 | </tr> | 350 | </tr> |
| 2528 | 362 | </blockTable> | 351 | </blockTable> |
| 2529 | @@ -376,10 +365,10 @@ | |||
| 2530 | 376 | <blockTable colWidths="58.0,58.0" style="Table2">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] | 365 | <blockTable colWidths="58.0,58.0" style="Table2">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] |
| 2531 | 377 | <tr> | 366 | <tr> |
| 2532 | 378 | <td> | 367 | <td> |
| 2534 | 379 | <para style="terp_tblheader_General_Centre">Start Date</para> | 368 | <para style="terp_tblheader_General_Centre"><b>Start Date</b></para> |
| 2535 | 380 | </td> | 369 | </td> |
| 2536 | 381 | <td> | 370 | <td> |
| 2538 | 382 | <para style="terp_tblheader_General_Centre">End Date</para> | 371 | <para style="terp_tblheader_General_Centre"><b>End Date</b></para> |
| 2539 | 383 | </td> | 372 | </td> |
| 2540 | 384 | </tr> | 373 | </tr> |
| 2541 | 385 | </blockTable> | 374 | </blockTable> |
| 2542 | @@ -396,10 +385,10 @@ | |||
| 2543 | 396 | <blockTable colWidths="58.0,58.0" style="Table4">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] | 385 | <blockTable colWidths="58.0,58.0" style="Table4">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] |
| 2544 | 397 | <tr> | 386 | <tr> |
| 2545 | 398 | <td> | 387 | <td> |
| 2547 | 399 | <para style="terp_tblheader_General_Centre">Start Period</para> | 388 | <para style="terp_tblheader_General_Centre"><b>Start Period</b></para> |
| 2548 | 400 | </td> | 389 | </td> |
| 2549 | 401 | <td> | 390 | <td> |
| 2551 | 402 | <para style="terp_tblheader_General_Centre">End Period</para> | 391 | <para style="terp_tblheader_General_Centre"><b>End Period</b></para> |
| 2552 | 403 | </td> | 392 | </td> |
| 2553 | 404 | </tr> | 393 | </tr> |
| 2554 | 405 | </blockTable> | 394 | </blockTable> |
| 2555 | @@ -428,37 +417,37 @@ | |||
| 2556 | 428 | <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] | 417 | <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] |
| 2557 | 429 | <tr> | 418 | <tr> |
| 2558 | 430 | <td> | 419 | <td> |
| 2590 | 431 | <para style="terp_tblheader_Details">Date</para> | 420 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 2591 | 432 | </td> | 421 | </td> |
| 2592 | 433 | <td> | 422 | <td> |
| 2593 | 434 | <para style="terp_tblheader_Details">JRNL</para> | 423 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 2594 | 435 | </td> | 424 | </td> |
| 2595 | 436 | <td> | 425 | <td> |
| 2596 | 437 | <para style="terp_tblheader_Details">Partner</para> | 426 | <para style="terp_tblheader_Details"><b>Partner</b></para> |
| 2597 | 438 | </td> | 427 | </td> |
| 2598 | 439 | <td> | 428 | <td> |
| 2599 | 440 | <para style="terp_tblheader_Details_Centre">Ref</para> | 429 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 2600 | 441 | </td> | 430 | </td> |
| 2601 | 442 | <td> | 431 | <td> |
| 2602 | 443 | <para style="terp_tblheader_Details_Centre">Move</para> | 432 | <para style="terp_tblheader_Details_Centre"><b>Move</b></para> |
| 2603 | 444 | </td> | 433 | </td> |
| 2604 | 445 | <td> | 434 | <td> |
| 2605 | 446 | <para style="terp_tblheader_Details">Entry Label</para> | 435 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 2606 | 447 | </td> | 436 | </td> |
| 2607 | 448 | <td> | 437 | <td> |
| 2608 | 449 | <para style="terp_tblheader_Details_Centre">Counterpart</para> | 438 | <para style="terp_tblheader_Details_Centre"><b>Counterpart</b></para> |
| 2609 | 450 | </td> | 439 | </td> |
| 2610 | 451 | <td> | 440 | <td> |
| 2611 | 452 | <para style="terp_tblheader_Details_Right">Debit</para> | 441 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 2612 | 453 | </td> | 442 | </td> |
| 2613 | 454 | <td> | 443 | <td> |
| 2614 | 455 | <para style="terp_tblheader_Details_Right">Credit</para> | 444 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 2615 | 456 | </td> | 445 | </td> |
| 2616 | 457 | <td> | 446 | <td> |
| 2617 | 458 | <para style="terp_tblheader_Details_Right">Balance</para> | 447 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 2618 | 459 | </td> | 448 | </td> |
| 2619 | 460 | <td> | 449 | <td> |
| 2620 | 461 | <para style="terp_tblheader_Details_Right">Currency</para> | 450 | <para style="terp_tblheader_Details_Right"><b>Currency</b></para> |
| 2621 | 462 | </td> | 451 | </td> |
| 2622 | 463 | </tr> | 452 | </tr> |
| 2623 | 464 | </blockTable> | 453 | </blockTable> |
| 2624 | @@ -467,19 +456,19 @@ | |||
| 2625 | 467 | <blockTable rowHeights="0.55cm" colWidths="278.0,57.0,57.0,74.0,74.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] | 456 | <blockTable rowHeights="0.55cm" colWidths="278.0,57.0,57.0,74.0,74.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] |
| 2626 | 468 | <tr> | 457 | <tr> |
| 2627 | 469 | <td> | 458 | <td> |
| 2641 | 470 | <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para> | 459 | <para style="terp_default_Bold_9"><b><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</b></para> |
| 2642 | 471 | </td> | 460 | </td> |
| 2643 | 472 | <td> | 461 | <td> |
| 2644 | 473 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para> | 462 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</b></para> |
| 2645 | 474 | </td> | 463 | </td> |
| 2646 | 475 | <td> | 464 | <td> |
| 2647 | 476 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para> | 465 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</b></para> |
| 2648 | 477 | </td> | 466 | </td> |
| 2649 | 478 | <td> | 467 | <td> |
| 2650 | 479 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para> | 468 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</b></para> |
| 2651 | 480 | </td> | 469 | </td> |
| 2652 | 481 | <td> | 470 | <td> |
| 2653 | 482 | <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para> | 471 | <para style="terp_default_Bold_9_Right"><b>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</b></para> |
| 2654 | 483 | </td> | 472 | </td> |
| 2655 | 484 | </tr> | 473 | </tr> |
| 2656 | 485 | </blockTable> | 474 | </blockTable> |
| 2657 | @@ -527,34 +516,34 @@ | |||
| 2658 | 527 | <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] | 516 | <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] |
| 2659 | 528 | <tr> | 517 | <tr> |
| 2660 | 529 | <td> | 518 | <td> |
| 2689 | 530 | <para style="terp_tblheader_Details">Date</para> | 519 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 2690 | 531 | </td> | 520 | </td> |
| 2691 | 532 | <td> | 521 | <td> |
| 2692 | 533 | <para style="terp_tblheader_Details">JRNL</para> | 522 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 2693 | 534 | </td> | 523 | </td> |
| 2694 | 535 | <td> | 524 | <td> |
| 2695 | 536 | <para style="terp_tblheader_Details">Partner</para> | 525 | <para style="terp_tblheader_Details"><b>Partner</b></para> |
| 2696 | 537 | </td> | 526 | </td> |
| 2697 | 538 | <td> | 527 | <td> |
| 2698 | 539 | <para style="terp_tblheader_Details_Centre">Ref</para> | 528 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 2699 | 540 | </td> | 529 | </td> |
| 2700 | 541 | <td> | 530 | <td> |
| 2701 | 542 | <para style="terp_tblheader_Details_Centre">Move</para> | 531 | <para style="terp_tblheader_Details_Centre"><b>Move</b></para> |
| 2702 | 543 | </td> | 532 | </td> |
| 2703 | 544 | <td> | 533 | <td> |
| 2704 | 545 | <para style="terp_tblheader_Details">Entry Label</para> | 534 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 2705 | 546 | </td> | 535 | </td> |
| 2706 | 547 | <td> | 536 | <td> |
| 2707 | 548 | <para style="terp_tblheader_Details_Centre">Counterpart</para> | 537 | <para style="terp_tblheader_Details_Centre"><b>Counterpart</b></para> |
| 2708 | 549 | </td> | 538 | </td> |
| 2709 | 550 | <td> | 539 | <td> |
| 2710 | 551 | <para style="terp_tblheader_Details_Right">Debit</para> | 540 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 2711 | 552 | </td> | 541 | </td> |
| 2712 | 553 | <td> | 542 | <td> |
| 2713 | 554 | <para style="terp_tblheader_Details_Right">Credit</para> | 543 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 2714 | 555 | </td> | 544 | </td> |
| 2715 | 556 | <td> | 545 | <td> |
| 2716 | 557 | <para style="terp_tblheader_Details_Right">Balance</para> | 546 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 2717 | 558 | </td> | 547 | </td> |
| 2718 | 559 | </tr> | 548 | </tr> |
| 2719 | 560 | </blockTable> | 549 | </blockTable> |
| 2720 | @@ -563,16 +552,16 @@ | |||
| 2721 | 563 | <blockTable rowHeights="0.55cm" colWidths="349.0,57.0,57.0,77.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] | 552 | <blockTable rowHeights="0.55cm" colWidths="349.0,57.0,57.0,77.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] |
| 2722 | 564 | <tr> | 553 | <tr> |
| 2723 | 565 | <td> | 554 | <td> |
| 2734 | 566 | <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para> | 555 | <para style="terp_default_Bold_9"><b><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</b></para> |
| 2735 | 567 | </td> | 556 | </td> |
| 2736 | 568 | <td> | 557 | <td> |
| 2737 | 569 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para> | 558 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</b></para> |
| 2738 | 570 | </td> | 559 | </td> |
| 2739 | 571 | <td> | 560 | <td> |
| 2740 | 572 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para> | 561 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</b></para> |
| 2741 | 573 | </td> | 562 | </td> |
| 2742 | 574 | <td> | 563 | <td> |
| 2743 | 575 | <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para> | 564 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</b></para> |
| 2744 | 576 | </td> | 565 | </td> |
| 2745 | 577 | </tr> | 566 | </tr> |
| 2746 | 578 | </blockTable> | 567 | </blockTable> |
| 2747 | 579 | 568 | ||
| 2748 | === modified file 'account/report/account_general_ledger_landscape.rml' | |||
| 2749 | --- account/report/account_general_ledger_landscape.rml 2013-06-14 21:36:02 +0000 | |||
| 2750 | +++ account/report/account_general_ledger_landscape.rml 2013-08-13 05:40:59 +0000 | |||
| 2751 | @@ -237,38 +237,27 @@ | |||
| 2752 | 237 | <initialize> | 237 | <initialize> |
| 2753 | 238 | <paraStyle name="all" alignment="justify"/> | 238 | <paraStyle name="all" alignment="justify"/> |
| 2754 | 239 | </initialize> | 239 | </initialize> |
| 2787 | 240 | <paraStyle name="Standard" fontName="Helvetica"/> | 240 | <paraStyle name="Standard"/> |
| 2788 | 241 | <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> | 241 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 2789 | 242 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 242 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2790 | 243 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 243 | <paraStyle name="terp_tblheader_Details" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2791 | 244 | <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> | 244 | <paraStyle name="terp_default_7" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2792 | 245 | <paraStyle name="Index" fontName="Helvetica"/> | 245 | <paraStyle name="terp_default_Bold_7" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2793 | 246 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 246 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2794 | 247 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 247 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2795 | 248 | <paraStyle name="Footer" fontName="Helvetica"/> | 248 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2796 | 249 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 249 | <paraStyle name="terp_tblheader_Details_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 2797 | 250 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 250 | <paraStyle name="terp_default_Right_7" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2798 | 251 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 251 | <paraStyle name="terp_default_Centre_7" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2799 | 252 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 252 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 2800 | 253 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 253 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2801 | 254 | <paraStyle name="terp_default_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 254 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2802 | 255 | <paraStyle name="terp_default_Bold_7" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 255 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2803 | 256 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 256 | <paraStyle name="terp_default_Bold_7" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2804 | 257 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 257 | <paraStyle name="terp_default_Centre_9" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2805 | 258 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 258 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2806 | 259 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 259 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2807 | 260 | <paraStyle name="terp_default_Right_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 260 | <paraStyle name="terp_default_Bold_7_Right" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 2776 | 261 | <paraStyle name="terp_default_Centre_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2777 | 262 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 2778 | 263 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2779 | 264 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2780 | 265 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2781 | 266 | <paraStyle name="terp_default_Bold_7" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2782 | 267 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2783 | 268 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2784 | 269 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2785 | 270 | <paraStyle name="terp_default_Bold_7_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 2786 | 271 | <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 2808 | 272 | <images/> | 261 | <images/> |
| 2809 | 273 | </stylesheet> | 262 | </stylesheet> |
| 2810 | 274 | <story> | 263 | <story> |
| 2811 | @@ -277,108 +266,108 @@ | |||
| 2812 | 277 | <blockTable colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] | 266 | <blockTable colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] |
| 2813 | 278 | <tr> | 267 | <tr> |
| 2814 | 279 | <td> | 268 | <td> |
| 2849 | 280 | <para style="terp_tblheader_Details">Date</para> | 269 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 2850 | 281 | </td> | 270 | </td> |
| 2851 | 282 | <td> | 271 | <td> |
| 2852 | 283 | <para style="terp_tblheader_Details">Period</para> | 272 | <para style="terp_tblheader_Details"><b>Period</b></para> |
| 2853 | 284 | </td> | 273 | </td> |
| 2854 | 285 | <td> | 274 | <td> |
| 2855 | 286 | <para style="terp_tblheader_Details">JRNL</para> | 275 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 2856 | 287 | </td> | 276 | </td> |
| 2857 | 288 | <td> | 277 | <td> |
| 2858 | 289 | <para style="terp_tblheader_Details">Partner</para> | 278 | <para style="terp_tblheader_Details"><b>Partner</b></para> |
| 2859 | 290 | </td> | 279 | </td> |
| 2860 | 291 | <td> | 280 | <td> |
| 2861 | 292 | <para style="terp_tblheader_Details">Ref</para> | 281 | <para style="terp_tblheader_Details"><b>Ref</b></para> |
| 2862 | 293 | </td> | 282 | </td> |
| 2863 | 294 | <td> | 283 | <td> |
| 2864 | 295 | <para style="terp_tblheader_Details">Move</para> | 284 | <para style="terp_tblheader_Details"><b>Move</b></para> |
| 2865 | 296 | </td> | 285 | </td> |
| 2866 | 297 | <td> | 286 | <td> |
| 2867 | 298 | <para style="terp_tblheader_Details">Entry Label</para> | 287 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 2868 | 299 | </td> | 288 | </td> |
| 2869 | 300 | <td> | 289 | <td> |
| 2870 | 301 | <para style="terp_tblheader_Details">Counterpart</para> | 290 | <para style="terp_tblheader_Details"><b>Counterpart</b></para> |
| 2871 | 302 | </td> | 291 | </td> |
| 2872 | 303 | <td> | 292 | <td> |
| 2873 | 304 | <para style="terp_tblheader_Details_Right">Debit</para> | 293 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 2874 | 305 | </td> | 294 | </td> |
| 2875 | 306 | <td> | 295 | <td> |
| 2876 | 307 | <para style="terp_tblheader_Details_Right">Credit</para> | 296 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 2877 | 308 | </td> | 297 | </td> |
| 2878 | 309 | <td> | 298 | <td> |
| 2879 | 310 | <para style="terp_tblheader_Details_Right">Balance</para> | 299 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 2880 | 311 | </td> | 300 | </td> |
| 2881 | 312 | <td> | 301 | <td> |
| 2882 | 313 | <para style="terp_tblheader_Details_Right">Currency</para> | 302 | <para style="terp_tblheader_Details_Right"><b>Currency</b></para> |
| 2883 | 314 | </td> | 303 | </td> |
| 2884 | 315 | </tr> | 304 | </tr> |
| 2885 | 316 | </blockTable> | 305 | </blockTable> |
| 2886 | 317 | <blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] | 306 | <blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] |
| 2887 | 318 | <tr> | 307 | <tr> |
| 2888 | 319 | <td> | 308 | <td> |
| 2920 | 320 | <para style="terp_tblheader_Details">Date</para> | 309 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 2921 | 321 | </td> | 310 | </td> |
| 2922 | 322 | <td> | 311 | <td> |
| 2923 | 323 | <para style="terp_tblheader_Details">Period</para> | 312 | <para style="terp_tblheader_Details"><b>Period</b></para> |
| 2924 | 324 | </td> | 313 | </td> |
| 2925 | 325 | <td> | 314 | <td> |
| 2926 | 326 | <para style="terp_tblheader_Details">JRNL</para> | 315 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 2927 | 327 | </td> | 316 | </td> |
| 2928 | 328 | <td> | 317 | <td> |
| 2929 | 329 | <para style="terp_tblheader_Details">Partner</para> | 318 | <para style="terp_tblheader_Details"><b>Partner</b></para> |
| 2930 | 330 | </td> | 319 | </td> |
| 2931 | 331 | <td> | 320 | <td> |
| 2932 | 332 | <para style="terp_tblheader_Details">Ref</para> | 321 | <para style="terp_tblheader_Details"><b>Ref</b></para> |
| 2933 | 333 | </td> | 322 | </td> |
| 2934 | 334 | <td> | 323 | <td> |
| 2935 | 335 | <para style="terp_tblheader_Details">Move</para> | 324 | <para style="terp_tblheader_Details"><b>Move</b></para> |
| 2936 | 336 | </td> | 325 | </td> |
| 2937 | 337 | <td> | 326 | <td> |
| 2938 | 338 | <para style="terp_tblheader_Details">Entry Label</para> | 327 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 2939 | 339 | </td> | 328 | </td> |
| 2940 | 340 | <td> | 329 | <td> |
| 2941 | 341 | <para style="terp_tblheader_Details">Counterpart</para> | 330 | <para style="terp_tblheader_Details"><b>Counterpart</b></para> |
| 2942 | 342 | </td> | 331 | </td> |
| 2943 | 343 | <td> | 332 | <td> |
| 2944 | 344 | <para style="terp_tblheader_Details_Right">Debit</para> | 333 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 2945 | 345 | </td> | 334 | </td> |
| 2946 | 346 | <td> | 335 | <td> |
| 2947 | 347 | <para style="terp_tblheader_Details_Right">Credit</para> | 336 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 2948 | 348 | </td> | 337 | </td> |
| 2949 | 349 | <td> | 338 | <td> |
| 2950 | 350 | <para style="terp_tblheader_Details_Right">Balance</para> | 339 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 2951 | 351 | </td> | 340 | </td> |
| 2952 | 352 | </tr> | 341 | </tr> |
| 2953 | 353 | </blockTable> | 342 | </blockTable> |
| 2954 | 354 | </pto_header> | 343 | </pto_header> |
| 2957 | 355 | <para style="terp_default_7">[[ repeatIn(objects, 'a') ]]</para> | 344 | <para style="terp_default_7"><b>[[ repeatIn(objects, 'a') ]]</b></para> |
| 2958 | 356 | <para style="terp_header_Centre">General Ledger</para> | 345 | <para style="terp_header_Centre"><b>General Ledger</b></para> |
| 2959 | 357 | <para style="terp_default_7"> | 346 | <para style="terp_default_7"> |
| 2960 | 358 | <font color="white"> </font> | 347 | <font color="white"> </font> |
| 2961 | 359 | </para> | 348 | </para> |
| 2962 | 360 | <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1"> | 349 | <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1"> |
| 2963 | 361 | <tr> | 350 | <tr> |
| 2964 | 362 | <td> | 351 | <td> |
| 2984 | 363 | <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para> | 352 | <para style="terp_tblheader_General_Centre"><b>Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</b></para> |
| 2985 | 364 | <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td> | 353 | <para style="terp_tblheader_General_Centre"><b>Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</b></para></td> |
| 2986 | 365 | <td> | 354 | <td> |
| 2987 | 366 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> | 355 | <para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para> |
| 2988 | 367 | </td> | 356 | </td> |
| 2989 | 368 | <td> | 357 | <td> |
| 2990 | 369 | <para style="terp_tblheader_General_Centre">Journals</para> | 358 | <para style="terp_tblheader_General_Centre"><b>Journals</b></para> |
| 2991 | 370 | </td> | 359 | </td> |
| 2992 | 371 | <td> | 360 | <td> |
| 2993 | 372 | <para style="terp_tblheader_General_Centre">Display Account</para> | 361 | <para style="terp_tblheader_General_Centre"><b>Display Account</b></para> |
| 2994 | 373 | </td> | 362 | </td> |
| 2995 | 374 | <td> | 363 | <td> |
| 2996 | 375 | <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para> | 364 | <para style="terp_tblheader_General_Centre"><b>Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</b></para> |
| 2997 | 376 | </td> | 365 | </td> |
| 2998 | 377 | <td> | 366 | <td> |
| 2999 | 378 | <para style="terp_tblheader_General_Centre">Entries Sorted By</para> | 367 | <para style="terp_tblheader_General_Centre"><b>Entries Sorted By</b></para> |
| 3000 | 379 | </td> | 368 | </td> |
| 3001 | 380 | <td> | 369 | <td> |
| 3002 | 381 | <para style="terp_tblheader_General_Centre">Target Moves</para> | 370 | <para style="terp_tblheader_General_Centre"><b>Target Moves</b></para> |
| 3003 | 382 | </td> | 371 | </td> |
| 3004 | 383 | </tr> | 372 | </tr> |
| 3005 | 384 | </blockTable> | 373 | </blockTable> |
| 3006 | @@ -403,10 +392,10 @@ | |||
| 3007 | 403 | <blockTable colWidths="58.0,58.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] | 392 | <blockTable colWidths="58.0,58.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] |
| 3008 | 404 | <tr> | 393 | <tr> |
| 3009 | 405 | <td> | 394 | <td> |
| 3011 | 406 | <para style="terp_tblheader_General_Centre">Start Date</para> | 395 | <para style="terp_tblheader_General_Centre"><b>Start Date</b></para> |
| 3012 | 407 | </td> | 396 | </td> |
| 3013 | 408 | <td> | 397 | <td> |
| 3015 | 409 | <para style="terp_tblheader_General_Centre">End Date</para> | 398 | <para style="terp_tblheader_General_Centre"><b>End Date</b></para> |
| 3016 | 410 | </td> | 399 | </td> |
| 3017 | 411 | </tr> | 400 | </tr> |
| 3018 | 412 | </blockTable> | 401 | </blockTable> |
| 3019 | @@ -423,10 +412,10 @@ | |||
| 3020 | 423 | <blockTable colWidths="58.0,58.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] | 412 | <blockTable colWidths="58.0,58.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] |
| 3021 | 424 | <tr> | 413 | <tr> |
| 3022 | 425 | <td> | 414 | <td> |
| 3024 | 426 | <para style="terp_tblheader_General_Centre">Start Period</para> | 415 | <para style="terp_tblheader_General_Centre"><b>Start Period</b></para> |
| 3025 | 427 | </td> | 416 | </td> |
| 3026 | 428 | <td> | 417 | <td> |
| 3028 | 429 | <para style="terp_tblheader_General_Centre">End Period</para> | 418 | <para style="terp_tblheader_General_Centre"><b>End Period</b></para> |
| 3029 | 430 | </td> | 419 | </td> |
| 3030 | 431 | </tr> | 420 | </tr> |
| 3031 | 432 | </blockTable> | 421 | </blockTable> |
| 3032 | @@ -455,61 +444,61 @@ | |||
| 3033 | 455 | <blockTable colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] | 444 | <blockTable colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] |
| 3034 | 456 | <tr> | 445 | <tr> |
| 3035 | 457 | <td> | 446 | <td> |
| 3070 | 458 | <para style="terp_tblheader_Details">Date</para> | 447 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 3071 | 459 | </td> | 448 | </td> |
| 3072 | 460 | <td> | 449 | <td> |
| 3073 | 461 | <para style="terp_tblheader_Details">Period</para> | 450 | <para style="terp_tblheader_Details"><b>Period</b></para> |
| 3074 | 462 | </td> | 451 | </td> |
| 3075 | 463 | <td> | 452 | <td> |
| 3076 | 464 | <para style="terp_tblheader_Details">JRNL</para> | 453 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 3077 | 465 | </td> | 454 | </td> |
| 3078 | 466 | <td> | 455 | <td> |
| 3079 | 467 | <para style="terp_tblheader_Details">Partner</para> | 456 | <para style="terp_tblheader_Details"><b>Partner</b></para> |
| 3080 | 468 | </td> | 457 | </td> |
| 3081 | 469 | <td> | 458 | <td> |
| 3082 | 470 | <para style="terp_tblheader_Details">Ref</para> | 459 | <para style="terp_tblheader_Details"><b>Ref</b></para> |
| 3083 | 471 | </td> | 460 | </td> |
| 3084 | 472 | <td> | 461 | <td> |
| 3085 | 473 | <para style="terp_tblheader_Details">Move</para> | 462 | <para style="terp_tblheader_Details"><b>Move</b></para> |
| 3086 | 474 | </td> | 463 | </td> |
| 3087 | 475 | <td> | 464 | <td> |
| 3088 | 476 | <para style="terp_tblheader_Details">Entry Label</para> | 465 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 3089 | 477 | </td> | 466 | </td> |
| 3090 | 478 | <td> | 467 | <td> |
| 3091 | 479 | <para style="terp_tblheader_Details">Counterpart</para> | 468 | <para style="terp_tblheader_Details"><b>Counterpart</b></para> |
| 3092 | 480 | </td> | 469 | </td> |
| 3093 | 481 | <td> | 470 | <td> |
| 3094 | 482 | <para style="terp_tblheader_Details_Right">Debit</para> | 471 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 3095 | 483 | </td> | 472 | </td> |
| 3096 | 484 | <td> | 473 | <td> |
| 3097 | 485 | <para style="terp_tblheader_Details_Right">Credit</para> | 474 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 3098 | 486 | </td> | 475 | </td> |
| 3099 | 487 | <td> | 476 | <td> |
| 3100 | 488 | <para style="terp_tblheader_Details_Right">Balance</para> | 477 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 3101 | 489 | </td> | 478 | </td> |
| 3102 | 490 | <td> | 479 | <td> |
| 3103 | 491 | <para style="terp_tblheader_Details_Right">Currency</para> | 480 | <para style="terp_tblheader_Details_Right"><b>Currency</b></para> |
| 3104 | 492 | </td> | 481 | </td> |
| 3105 | 493 | </tr> | 482 | </tr> |
| 3106 | 494 | </blockTable> | 483 | </blockTable> |
| 3107 | 495 | <section> | 484 | <section> |
| 3109 | 496 | <para style="terp_default_7">[[ repeatIn(get_children_accounts(a), 'o') ]]</para> | 485 | <para style="terp_default_7"><b>[[ repeatIn(get_children_accounts(a), 'o') ]]</b></para> |
| 3110 | 497 | <blockTable rowHeights="0.55cm" colWidths="490.0,65.0,65.0,75.0,75.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] | 486 | <blockTable rowHeights="0.55cm" colWidths="490.0,65.0,65.0,75.0,75.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] |
| 3111 | 498 | <tr> | 487 | <tr> |
| 3112 | 499 | <td> | 488 | <td> |
| 3113 | 500 | <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para> | 489 | <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para> |
| 3114 | 501 | </td> | 490 | </td> |
| 3115 | 502 | <td> | 491 | <td> |
| 3126 | 503 | <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para> | 492 | <para style="terp_default_Bold_7_Right"><b>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</b></para> |
| 3127 | 504 | </td> | 493 | </td> |
| 3128 | 505 | <td> | 494 | <td> |
| 3129 | 506 | <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para> | 495 | <para style="terp_default_Bold_7_Right"><b>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</b></para> |
| 3130 | 507 | </td> | 496 | </td> |
| 3131 | 508 | <td> | 497 | <td> |
| 3132 | 509 | <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj= company.currency_id) ]]</para> | 498 | <para style="terp_default_Bold_7_Right"><b>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj= company.currency_id) ]]</b></para> |
| 3133 | 510 | </td> | 499 | </td> |
| 3134 | 511 | <td> | 500 | <td> |
| 3135 | 512 | <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para> | 501 | <para style="terp_default_Bold_7_Right"><b>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</b></para> |
| 3136 | 513 | </td> | 502 | </td> |
| 3137 | 514 | </tr> | 503 | </tr> |
| 3138 | 515 | </blockTable> | 504 | </blockTable> |
| 3139 | @@ -560,55 +549,55 @@ | |||
| 3140 | 560 | <blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] | 549 | <blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] |
| 3141 | 561 | <tr> | 550 | <tr> |
| 3142 | 562 | <td> | 551 | <td> |
| 3174 | 563 | <para style="terp_tblheader_Details">Date</para> | 552 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 3175 | 564 | </td> | 553 | </td> |
| 3176 | 565 | <td> | 554 | <td> |
| 3177 | 566 | <para style="terp_tblheader_Details">Period</para> | 555 | <para style="terp_tblheader_Details"><b>Period</b></para> |
| 3178 | 567 | </td> | 556 | </td> |
| 3179 | 568 | <td> | 557 | <td> |
| 3180 | 569 | <para style="terp_tblheader_Details">JRNL</para> | 558 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 3181 | 570 | </td> | 559 | </td> |
| 3182 | 571 | <td> | 560 | <td> |
| 3183 | 572 | <para style="terp_tblheader_Details">Partner</para> | 561 | <para style="terp_tblheader_Details"><b>Partner</b></para> |
| 3184 | 573 | </td> | 562 | </td> |
| 3185 | 574 | <td> | 563 | <td> |
| 3186 | 575 | <para style="terp_tblheader_Details">Ref</para> | 564 | <para style="terp_tblheader_Details"><b>Ref</b></para> |
| 3187 | 576 | </td> | 565 | </td> |
| 3188 | 577 | <td> | 566 | <td> |
| 3189 | 578 | <para style="terp_tblheader_Details">Move</para> | 567 | <para style="terp_tblheader_Details"><b>Move</b></para> |
| 3190 | 579 | </td> | 568 | </td> |
| 3191 | 580 | <td> | 569 | <td> |
| 3192 | 581 | <para style="terp_tblheader_Details">Entry Label</para> | 570 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 3193 | 582 | </td> | 571 | </td> |
| 3194 | 583 | <td> | 572 | <td> |
| 3195 | 584 | <para style="terp_tblheader_Details">Counterpart</para> | 573 | <para style="terp_tblheader_Details"><b>Counterpart</b></para> |
| 3196 | 585 | </td> | 574 | </td> |
| 3197 | 586 | <td> | 575 | <td> |
| 3198 | 587 | <para style="terp_tblheader_Details_Right">Debit</para> | 576 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 3199 | 588 | </td> | 577 | </td> |
| 3200 | 589 | <td> | 578 | <td> |
| 3201 | 590 | <para style="terp_tblheader_Details_Right">Credit</para> | 579 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 3202 | 591 | </td> | 580 | </td> |
| 3203 | 592 | <td> | 581 | <td> |
| 3204 | 593 | <para style="terp_tblheader_Details_Right">Balance</para> | 582 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 3205 | 594 | </td> | 583 | </td> |
| 3206 | 595 | </tr> | 584 | </tr> |
| 3207 | 596 | </blockTable> | 585 | </blockTable> |
| 3208 | 597 | <section> | 586 | <section> |
| 3210 | 598 | <para style="Standard">[[ repeatIn(get_children_accounts(a), 'o') ]]</para> | 587 | <para style="Standard"><b>[[ repeatIn(get_children_accounts(a), 'o') ]]</b></para> |
| 3211 | 599 | <blockTable rowHeights="0.55cm" colWidths="575.0,65.0,65.0,75.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] | 588 | <blockTable rowHeights="0.55cm" colWidths="575.0,65.0,65.0,75.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] |
| 3212 | 600 | <tr> | 589 | <tr> |
| 3213 | 601 | <td> | 590 | <td> |
| 3214 | 602 | <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para> | 591 | <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para> |
| 3215 | 603 | </td> | 592 | </td> |
| 3216 | 604 | <td> | 593 | <td> |
| 3224 | 605 | <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para> | 594 | <para style="terp_default_Bold_7_Right"><b>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</b></para> |
| 3225 | 606 | </td> | 595 | </td> |
| 3226 | 607 | <td> | 596 | <td> |
| 3227 | 608 | <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para> | 597 | <para style="terp_default_Bold_7_Right"><b>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</b></para> |
| 3228 | 609 | </td> | 598 | </td> |
| 3229 | 610 | <td> | 599 | <td> |
| 3230 | 611 | <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para> | 600 | <para style="terp_default_Bold_7_Right"><b>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</b></para> |
| 3231 | 612 | </td> | 601 | </td> |
| 3232 | 613 | </tr> | 602 | </tr> |
| 3233 | 614 | </blockTable> | 603 | </blockTable> |
| 3234 | 615 | 604 | ||
| 3235 | === modified file 'account/report/account_journal.rml' | |||
| 3236 | --- account/report/account_journal.rml 2013-06-14 21:36:02 +0000 | |||
| 3237 | +++ account/report/account_journal.rml 2013-08-13 05:40:59 +0000 | |||
| 3238 | @@ -131,46 +131,34 @@ | |||
| 3239 | 131 | <initialize> | 131 | <initialize> |
| 3240 | 132 | <paraStyle name="all" alignment="justify"/> | 132 | <paraStyle name="all" alignment="justify"/> |
| 3241 | 133 | </initialize> | 133 | </initialize> |
| 3282 | 134 | <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 134 | <paraStyle name="P8" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3283 | 135 | <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 135 | <paraStyle name="P9" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3284 | 136 | <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 136 | <paraStyle name="P10a" fontSize="7.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3285 | 137 | <paraStyle name="P10a" fontName="Helvetica-Bold" fontSize="7.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 137 | <paraStyle name="P10b" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3286 | 138 | <paraStyle name="P10b" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 138 | <paraStyle name="P12" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3287 | 139 | <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 139 | <paraStyle name="Standard" /> |
| 3288 | 140 | <paraStyle name="P11a" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 140 | <paraStyle name="Table Contents" spaceBefore="0.0" spaceAfter="6.0"/> |
| 3289 | 141 | <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 141 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3290 | 142 | <paraStyle name="Standard" fontName="Times-Roman"/> | 142 | <paraStyle name="terp_default_8" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3291 | 143 | <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 143 | <paraStyle name="terp_default_Bold_8" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3292 | 144 | <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 144 | <paraStyle name="terp_tblheader_General" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3293 | 145 | <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 145 | <paraStyle name="terp_tblheader_General_Centre" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3294 | 146 | <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 146 | <paraStyle name="terp_default_Centre_8" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3295 | 147 | <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 147 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3296 | 148 | <paraStyle name="Index" fontName="Times-Roman"/> | 148 | <paraStyle name="terp_tblheader_General_Right" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3297 | 149 | <paraStyle name="Heading" fontName="Helvetica" fontSize="7.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/> | 149 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="7.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3298 | 150 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 150 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3299 | 151 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 151 | <paraStyle name="terp_default_Right_8" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3300 | 152 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 152 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3301 | 153 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 153 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3302 | 154 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 154 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3303 | 155 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 155 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3304 | 156 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 156 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3305 | 157 | <paraStyle name="Footer" fontName="Times-Roman"/> | 157 | <paraStyle name="terp_default_1" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3306 | 158 | <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 158 | <paraStyle name="terp_default_Right_9_Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3307 | 159 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 159 | <paraStyle name="terp_default_8_Italic" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3308 | 160 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 160 | <paraStyle name="terp_default_Centre_8" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3309 | 161 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 161 | <paraStyle name="terp_tblheader_Details_left" fontSize="7.0" leading="8" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3270 | 162 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 3271 | 163 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3272 | 164 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 3273 | 165 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 3274 | 166 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3275 | 167 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3276 | 168 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3277 | 169 | <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3278 | 170 | <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3279 | 171 | <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3280 | 172 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3281 | 173 | <paraStyle name="terp_tblheader_Details_left" fontName="Helvetica-Bold" fontSize="7.0" leading="8" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 3310 | 174 | </stylesheet> | 162 | </stylesheet> |
| 3311 | 175 | <images/> | 163 | <images/> |
| 3312 | 176 | <story> | 164 | <story> |
| 3313 | @@ -178,7 +166,7 @@ | |||
| 3314 | 178 | 166 | ||
| 3315 | 179 | <blockTable colWidths="539.0" style="Table_no_lines"> | 167 | <blockTable colWidths="539.0" style="Table_no_lines"> |
| 3316 | 180 | <tr> | 168 | <tr> |
| 3318 | 181 | <td><para style="terp_header_Centre">Journal</para></td> | 169 | <td><para style="terp_header_Centre"><b>Journal</b></para></td> |
| 3319 | 182 | </tr> | 170 | </tr> |
| 3320 | 183 | </blockTable> | 171 | </blockTable> |
| 3321 | 184 | <para style="P9"> | 172 | <para style="P9"> |
| 3322 | @@ -186,13 +174,13 @@ | |||
| 3323 | 186 | </para> | 174 | </para> |
| 3324 | 187 | <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2"> | 175 | <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2"> |
| 3325 | 188 | <tr> | 176 | <tr> |
| 3333 | 189 | <td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</para> | 177 | <td><para style="terp_tblheader_General_Centre"><b>Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</b></para> |
| 3334 | 190 | <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td> | 178 | <para style="terp_tblheader_General_Centre"><b>Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</b></para></td> |
| 3335 | 191 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> | 179 | <td><para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para></td> |
| 3336 | 192 | <td><para style="terp_tblheader_General_Centre">Journal</para></td> | 180 | <td><para style="terp_tblheader_General_Centre"><b>Journal</b></para></td> |
| 3337 | 193 | <td><para style="terp_tblheader_General_Centre">Period</para></td> | 181 | <td><para style="terp_tblheader_General_Centre"><b>Period</b></para></td> |
| 3338 | 194 | <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td> | 182 | <td><para style="terp_tblheader_General_Centre"><b>Entries Sorted By</b></para></td> |
| 3339 | 195 | <td><para style="terp_tblheader_General_Centre">Target Moves</para></td> | 183 | <td><para style="terp_tblheader_General_Centre"><b>Target Moves</b></para></td> |
| 3340 | 196 | </tr> | 184 | </tr> |
| 3341 | 197 | <tr> | 185 | <tr> |
| 3342 | 198 | <td><para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para></td> | 186 | <td><para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para></td> |
| 3343 | @@ -216,13 +204,13 @@ | |||
| 3344 | 216 | [[ display_currency(data) == False or removeParentNode('section') ]] | 204 | [[ display_currency(data) == False or removeParentNode('section') ]] |
| 3345 | 217 | <blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,95.0,160.0,70.0,70.0" style="Table1"> | 205 | <blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,95.0,160.0,70.0,70.0" style="Table1"> |
| 3346 | 218 | <tr> | 206 | <tr> |
| 3354 | 219 | <td><para style="P10a">Move</para></td> | 207 | <td><para style="P10a"><b>Move</b></para></td> |
| 3355 | 220 | <td><para style="P10a">Date</para></td> | 208 | <td><para style="P10a"><b>Date</b></para></td> |
| 3356 | 221 | <td><para style="P10a">Account</para></td> | 209 | <td><para style="P10a"><b>Account</b></para></td> |
| 3357 | 222 | <td><para style="P10a">Partner</para></td> | 210 | <td><para style="P10a"><b>Partner</b></para></td> |
| 3358 | 223 | <td><para style="P10a">Label</para></td> | 211 | <td><para style="P10a"><b>Label</b></para></td> |
| 3359 | 224 | <td><para style="P10b">Debit</para></td> | 212 | <td><para style="P10b"><b>Debit</b></para></td> |
| 3360 | 225 | <td><para style="P10b">Credit</para></td> | 213 | <td><para style="P10b"><b>Credit</b></para></td> |
| 3361 | 226 | </tr> | 214 | </tr> |
| 3362 | 227 | </blockTable> | 215 | </blockTable> |
| 3363 | 228 | <section> | 216 | <section> |
| 3364 | @@ -251,9 +239,9 @@ | |||
| 3365 | 251 | <td><para style="P11"></para></td> | 239 | <td><para style="P11"></para></td> |
| 3366 | 252 | <td><para style="P11"></para></td> | 240 | <td><para style="P11"></para></td> |
| 3367 | 253 | <td><para style="P11"><font color="white"></font></para></td> | 241 | <td><para style="P11"><font color="white"></font></para></td> |
| 3371 | 254 | <td><para style="P12">Total:</para></td> | 242 | <td><para style="P12"><b>Total:</b></para></td> |
| 3372 | 255 | <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td> | 243 | <td><para style="P12"><b>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</b></para></td> |
| 3373 | 256 | <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td> | 244 | <td><para style="P12"><b>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</b></para></td> |
| 3374 | 257 | </tr> | 245 | </tr> |
| 3375 | 258 | </blockTable> | 246 | </blockTable> |
| 3376 | 259 | </section> | 247 | </section> |
| 3377 | @@ -262,14 +250,14 @@ | |||
| 3378 | 262 | [[ display_currency(data) or removeParentNode('section') ]] | 250 | [[ display_currency(data) or removeParentNode('section') ]] |
| 3379 | 263 | <blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,130.0,70.0,70.0,70.0" style="Table1"> | 251 | <blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,130.0,70.0,70.0,70.0" style="Table1"> |
| 3380 | 264 | <tr> | 252 | <tr> |
| 3389 | 265 | <td><para style="P10a">Move</para></td> | 253 | <td><para style="P10a"><b>Move</b></para></td> |
| 3390 | 266 | <td><para style="P10a">Date</para></td> | 254 | <td><para style="P10a"><b>Date</b></para></td> |
| 3391 | 267 | <td><para style="P10a">Account</para></td> | 255 | <td><para style="P10a"><b>Account</b></para></td> |
| 3392 | 268 | <td><para style="P10a">Partner</para></td> | 256 | <td><para style="P10a"><b>Partner</b></para></td> |
| 3393 | 269 | <td><para style="P10a">Label</para></td> | 257 | <td><para style="P10a"><b>Label</b></para></td> |
| 3394 | 270 | <td><para style="P10b">Debit</para></td> | 258 | <td><para style="P10b"><b>Debit</b></para></td> |
| 3395 | 271 | <td><para style="P10b">Credit</para></td> | 259 | <td><para style="P10b"><b>Credit</b></para></td> |
| 3396 | 272 | <td><para style="P10b">Currency</para></td> | 260 | <td><para style="P10b"><b>Currency</b></para></td> |
| 3397 | 273 | </tr> | 261 | </tr> |
| 3398 | 274 | </blockTable> | 262 | </blockTable> |
| 3399 | 275 | <section> | 263 | <section> |
| 3400 | @@ -299,9 +287,9 @@ | |||
| 3401 | 299 | <td><para style="P11"></para></td> | 287 | <td><para style="P11"></para></td> |
| 3402 | 300 | <td><para style="P11"></para></td> | 288 | <td><para style="P11"></para></td> |
| 3403 | 301 | <td><para style="P11"><font color="white"></font></para></td> | 289 | <td><para style="P11"><font color="white"></font></para></td> |
| 3407 | 302 | <td><para style="P12">Total:</para></td> | 290 | <td><para style="P12"><b>Total:</b></para></td> |
| 3408 | 303 | <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td> | 291 | <td><para style="P12"><b>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</b></para></td> |
| 3409 | 304 | <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td> | 292 | <td><para style="P12"><b>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</b></para></td> |
| 3410 | 305 | <!-- given a period and a journal, the sum of debit will always be equal to the sum of credit, so there is no point to display it--> | 293 | <!-- given a period and a journal, the sum of debit will always be equal to the sum of credit, so there is no point to display it--> |
| 3411 | 306 | <td><para style="P12"> <!--o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol --></para></td> | 294 | <td><para style="P12"> <!--o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol --></para></td> |
| 3412 | 307 | </tr> | 295 | </tr> |
| 3413 | 308 | 296 | ||
| 3414 | === modified file 'account/report/account_journal_sale_purchase.rml' | |||
| 3415 | --- account/report/account_journal_sale_purchase.rml 2013-06-06 14:29:09 +0000 | |||
| 3416 | +++ account/report/account_journal_sale_purchase.rml 2013-08-13 05:40:59 +0000 | |||
| 3417 | @@ -131,46 +131,35 @@ | |||
| 3418 | 131 | <initialize> | 131 | <initialize> |
| 3419 | 132 | <paraStyle name="all" alignment="justify"/> | 132 | <paraStyle name="all" alignment="justify"/> |
| 3420 | 133 | </initialize> | 133 | </initialize> |
| 3461 | 134 | <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 134 | <paraStyle name="P8" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3462 | 135 | <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 135 | <paraStyle name="P9" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3463 | 136 | <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 136 | <paraStyle name="P10a" fontSize="7.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3464 | 137 | <paraStyle name="P10a" fontName="Helvetica-Bold" fontSize="7.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 137 | <paraStyle name="P10b" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3465 | 138 | <paraStyle name="P10b" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 138 | <paraStyle name="P11" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3466 | 139 | <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 139 | <paraStyle name="P12" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3467 | 140 | <paraStyle name="P11a" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 140 | <paraStyle name="Standard" /> |
| 3468 | 141 | <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 141 | <paraStyle name="Table Contents" spaceBefore="0.0" spaceAfter="6.0"/> |
| 3469 | 142 | <paraStyle name="Standard" fontName="Times-Roman"/> | 142 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3470 | 143 | <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 143 | <paraStyle name="terp_default_8" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3471 | 144 | <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 144 | <paraStyle name="terp_default_Bold_8" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3472 | 145 | <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> | 145 | <paraStyle name="terp_tblheader_General" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3473 | 146 | <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 146 | <paraStyle name="terp_tblheader_General_Centre" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3474 | 147 | <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 147 | <paraStyle name="terp_default_Centre_8" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3475 | 148 | <paraStyle name="Index" fontName="Times-Roman"/> | 148 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3476 | 149 | <paraStyle name="Heading" fontName="Helvetica" fontSize="7.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/> | 149 | <paraStyle name="terp_tblheader_General_Right" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3477 | 150 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 150 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="7.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3478 | 151 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 151 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3479 | 152 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 152 | <paraStyle name="terp_default_Right_8" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3480 | 153 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 153 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3481 | 154 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 154 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3482 | 155 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 155 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3483 | 156 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 156 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3484 | 157 | <paraStyle name="Footer" fontName="Times-Roman"/> | 157 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3485 | 158 | <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 158 | <paraStyle name="terp_default_1" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3486 | 159 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 159 | <paraStyle name="terp_default_Right_9_Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3487 | 160 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 160 | <paraStyle name="terp_default_8_Italic" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3488 | 161 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 161 | <paraStyle name="terp_default_Centre_8" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3489 | 162 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 162 | <paraStyle name="terp_tblheader_Details_left" fontSize="7.0" leading="8" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3450 | 163 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3451 | 164 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 3452 | 165 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 3453 | 166 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3454 | 167 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3455 | 168 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3456 | 169 | <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3457 | 170 | <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3458 | 171 | <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3459 | 172 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3460 | 173 | <paraStyle name="terp_tblheader_Details_left" fontName="Helvetica-Bold" fontSize="7.0" leading="8" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 3490 | 174 | </stylesheet> | 163 | </stylesheet> |
| 3491 | 175 | <images/> | 164 | <images/> |
| 3492 | 176 | <story> | 165 | <story> |
| 3493 | @@ -178,7 +167,7 @@ | |||
| 3494 | 178 | 167 | ||
| 3495 | 179 | <blockTable colWidths="539.0" style="Table_no_lines"> | 168 | <blockTable colWidths="539.0" style="Table_no_lines"> |
| 3496 | 180 | <tr> | 169 | <tr> |
| 3498 | 181 | <td><para style="terp_header_Centre">Journal</para></td> | 170 | <td><para style="terp_header_Centre"><b>Journal</b></para></td> |
| 3499 | 182 | </tr> | 171 | </tr> |
| 3500 | 183 | </blockTable> | 172 | </blockTable> |
| 3501 | 184 | <para style="P9"> | 173 | <para style="P9"> |
| 3502 | @@ -186,13 +175,13 @@ | |||
| 3503 | 186 | </para> | 175 | </para> |
| 3504 | 187 | <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2"> | 176 | <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2"> |
| 3505 | 188 | <tr> | 177 | <tr> |
| 3513 | 189 | <td><para style="terp_tblheader_General_Centre"> [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para> | 178 | <td><para style="terp_tblheader_General_Centre"><b>[[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</b></para> |
| 3514 | 190 | <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td> | 179 | <para style="terp_tblheader_General_Centre"><b>[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</b></para></td> |
| 3515 | 191 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> | 180 | <td><para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para></td> |
| 3516 | 192 | <td><para style="terp_tblheader_General_Centre">Journal</para></td> | 181 | <td><para style="terp_tblheader_General_Centre"><b>Journal</b></para></td> |
| 3517 | 193 | <td><para style="terp_tblheader_General_Centre">Period</para></td> | 182 | <td><para style="terp_tblheader_General_Centre"><b>Period</b></para></td> |
| 3518 | 194 | <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td> | 183 | <td><para style="terp_tblheader_General_Centre"><b>Entries Sorted By</b></para></td> |
| 3519 | 195 | <td><para style="terp_tblheader_General_Centre">Target Moves</para></td> | 184 | <td><para style="terp_tblheader_General_Centre"><b>Target Moves</b></para></td> |
| 3520 | 196 | </tr> | 185 | </tr> |
| 3521 | 197 | <tr> | 186 | <tr> |
| 3522 | 198 | <td><para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para></td> | 187 | <td><para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para></td> |
| 3523 | @@ -214,15 +203,15 @@ | |||
| 3524 | 214 | [[ display_currency(data) == False or removeParentNode('section') ]] | 203 | [[ display_currency(data) == False or removeParentNode('section') ]] |
| 3525 | 215 | <blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,60.0,110.0,15.0,70.0,70.0,70.0" style="Table1"> | 204 | <blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,60.0,110.0,15.0,70.0,70.0,70.0" style="Table1"> |
| 3526 | 216 | <tr> | 205 | <tr> |
| 3533 | 217 | <td><para style="P10a">Move</para></td> | 206 | <td><para style="P10a"><b>Move</b></para></td> |
| 3534 | 218 | <td><para style="P10a">Date</para></td> | 207 | <td><para style="P10a"><b>Date</b></para></td> |
| 3535 | 219 | <td><para style="P10a">Account</para></td> | 208 | <td><para style="P10a"><b>Account</b></para></td> |
| 3536 | 220 | <td><para style="P10a">Partner</para></td> | 209 | <td><para style="P10a"><b>Partner</b></para></td> |
| 3537 | 221 | <td><para style="P10a">Label</para></td> | 210 | <td><para style="P10a"><b>Label</b></para></td> |
| 3538 | 222 | <td><para style="P10a">Tax</para></td> | 211 | <td><para style="P10a"><b>Tax</b></para></td> |
| 3539 | 223 | <td><para style="P11"></para></td> | 212 | <td><para style="P11"></para></td> |
| 3542 | 224 | <td><para style="P10b">Debit</para></td> | 213 | <td><para style="P10b"><b>Debit</b></para></td> |
| 3543 | 225 | <td><para style="P10b">Credit</para></td> | 214 | <td><para style="P10b"><b>Credit</b></para></td> |
| 3544 | 226 | </tr> | 215 | </tr> |
| 3545 | 227 | </blockTable> | 216 | </blockTable> |
| 3546 | 228 | <section> | 217 | <section> |
| 3547 | @@ -255,9 +244,9 @@ | |||
| 3548 | 255 | <td><para style="P11"><font color="white"></font></para></td> | 244 | <td><para style="P11"><font color="white"></font></para></td> |
| 3549 | 256 | <td><para style="P11"><font color="white"></font></para></td> | 245 | <td><para style="P11"><font color="white"></font></para></td> |
| 3550 | 257 | <td><para style="P11"><font color="white"></font></para></td> | 246 | <td><para style="P11"><font color="white"></font></para></td> |
| 3554 | 258 | <td><para style="P12">Total:</para></td> | 247 | <td><para style="P12"><b>Total:</b></para></td> |
| 3555 | 259 | <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td> | 248 | <td><para style="P12"><b>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</b></para></td> |
| 3556 | 260 | <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td> | 249 | <td><para style="P12"><b>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</b></para></td> |
| 3557 | 261 | </tr> | 250 | </tr> |
| 3558 | 262 | </blockTable> | 251 | </blockTable> |
| 3559 | 263 | </section> | 252 | </section> |
| 3560 | @@ -266,16 +255,16 @@ | |||
| 3561 | 266 | [[ display_currency(data) or removeParentNode('section') ]] | 255 | [[ display_currency(data) or removeParentNode('section') ]] |
| 3562 | 267 | <blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,50.0,70.0,10.0,70.0,70.0,70.0,70.0" style="Table1"> | 256 | <blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,50.0,70.0,10.0,70.0,70.0,70.0,70.0" style="Table1"> |
| 3563 | 268 | <tr> | 257 | <tr> |
| 3570 | 269 | <td><para style="P10a">Move</para></td> | 258 | <td><para style="P10a"><b>Move</b></para></td> |
| 3571 | 270 | <td><para style="P10a">Date</para></td> | 259 | <td><para style="P10a"><b>Date</b></para></td> |
| 3572 | 271 | <td><para style="P10a">Account</para></td> | 260 | <td><para style="P10a"><b>Account</b></para></td> |
| 3573 | 272 | <td><para style="P10a">Partner</para></td> | 261 | <td><para style="P10a"><b>Partner</b></para></td> |
| 3574 | 273 | <td><para style="P10a">Label</para></td> | 262 | <td><para style="P10a"><b>Label</b></para></td> |
| 3575 | 274 | <td><para style="P10a">Tax</para></td> | 263 | <td><para style="P10a"><b>Tax</b></para></td> |
| 3576 | 275 | <td><para style="P11"></para></td> | 264 | <td><para style="P11"></para></td> |
| 3580 | 276 | <td><para style="P10b">Debit</para></td> | 265 | <td><para style="P10b"><b>Debit</b></para></td> |
| 3581 | 277 | <td><para style="P10b">Credit</para></td> | 266 | <td><para style="P10b"><b>Credit</b></para></td> |
| 3582 | 278 | <td><para style="P10b">Currency</para></td> | 267 | <td><para style="P10b"><b>Currency</b></para></td> |
| 3583 | 279 | </tr> | 268 | </tr> |
| 3584 | 280 | </blockTable> | 269 | </blockTable> |
| 3585 | 281 | <section> | 270 | <section> |
| 3586 | @@ -309,9 +298,9 @@ | |||
| 3587 | 309 | <td><para style="P11"><font color="white"></font></para></td> | 298 | <td><para style="P11"><font color="white"></font></para></td> |
| 3588 | 310 | <td><para style="P11"><font color="white"></font></para></td> | 299 | <td><para style="P11"><font color="white"></font></para></td> |
| 3589 | 311 | <td><para style="P11"><font color="white"></font></para></td> | 300 | <td><para style="P11"><font color="white"></font></para></td> |
| 3593 | 312 | <td><para style="P12">Total:</para></td> | 301 | <td><para style="P12"><b>Total:</b></para></td> |
| 3594 | 313 | <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td> | 302 | <td><para style="P12"><b>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</b></para></td> |
| 3595 | 314 | <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td> | 303 | <td><para style="P12"><b>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</b></para></td> |
| 3596 | 315 | <!-- given a period and a journal, the sum of debit will always be equal to the sum of credit, so there is no point to display it--> | 304 | <!-- given a period and a journal, the sum of debit will always be equal to the sum of credit, so there is no point to display it--> |
| 3597 | 316 | <td><para style="P12"> <!--o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol --></para></td> | 305 | <td><para style="P12"> <!--o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol --></para></td> |
| 3598 | 317 | </tr> | 306 | </tr> |
| 3599 | @@ -330,7 +319,7 @@ | |||
| 3600 | 330 | <blockTable colWidths="15.0,80.0,20.0,182.0" style="Table1" repeatRows="1"> | 319 | <blockTable colWidths="15.0,80.0,20.0,182.0" style="Table1" repeatRows="1"> |
| 3601 | 331 | <tr> | 320 | <tr> |
| 3602 | 332 | <td><para style="P12"></para></td> | 321 | <td><para style="P12"></para></td> |
| 3604 | 333 | <td><para style="P12">Tax Declaration</para></td> | 322 | <td><para style="P12"><b>Tax Declaration</b></para></td> |
| 3605 | 334 | <td><para style="P12"></para></td> | 323 | <td><para style="P12"></para></td> |
| 3606 | 335 | <td><para style="P12"></para></td> | 324 | <td><para style="P12"></para></td> |
| 3607 | 336 | </tr> | 325 | </tr> |
| 3608 | 337 | 326 | ||
| 3609 | === modified file 'account/report/account_partner_balance.rml' | |||
| 3610 | --- account/report/account_partner_balance.rml 2011-12-21 09:08:11 +0000 | |||
| 3611 | +++ account/report/account_partner_balance.rml 2013-08-13 05:40:59 +0000 | |||
| 3612 | @@ -140,34 +140,18 @@ | |||
| 3613 | 140 | <paraStyle name="all" alignment="justify"/> | 140 | <paraStyle name="all" alignment="justify"/> |
| 3614 | 141 | </initialize> | 141 | </initialize> |
| 3615 | 142 | 142 | ||
| 3644 | 143 | <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | 143 | <paraStyle name="P3" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 3645 | 144 | <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 144 | <paraStyle name="P4" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 3646 | 145 | <paraStyle name="P5" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 145 | <paraStyle name="P7" fontSize="9" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 3647 | 146 | <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 146 | <paraStyle name="P8" fontSize="9" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 3648 | 147 | <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | 147 | <paraStyle name="P12a" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3649 | 148 | <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 148 | <paraStyle name="P12b" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 3650 | 149 | <paraStyle name="P9" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | 149 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3651 | 150 | <paraStyle name="P9b" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 150 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3652 | 151 | <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/> | 151 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3653 | 152 | <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10"/> | 152 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3654 | 153 | <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 153 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3655 | 154 | <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 154 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3628 | 155 | <paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 3629 | 156 | <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 3630 | 157 | <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 3631 | 158 | <paraStyle name="Standard" fontName="Helvetica"/> | ||
| 3632 | 159 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 3633 | 160 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3634 | 161 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 3635 | 162 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 3636 | 163 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 3637 | 164 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 3638 | 165 | <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 3639 | 166 | <paraStyle name="Index" fontName="Helvetica"/> | ||
| 3640 | 167 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3641 | 168 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 3642 | 169 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 3643 | 170 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 3656 | 171 | </stylesheet> | 155 | </stylesheet> |
| 3657 | 172 | 156 | ||
| 3658 | 173 | <story> | 157 | <story> |
| 3659 | @@ -175,7 +159,7 @@ | |||
| 3660 | 175 | <blockTable colWidths="539.0" style="Table_Company_Name"> | 159 | <blockTable colWidths="539.0" style="Table_Company_Name"> |
| 3661 | 176 | <tr> | 160 | <tr> |
| 3662 | 177 | <td> | 161 | <td> |
| 3664 | 178 | <para style="terp_header_Centre">Partner Balance</para> | 162 | <para style="terp_header_Centre"><b>Partner Balance</b></para> |
| 3665 | 179 | </td> | 163 | </td> |
| 3666 | 180 | </tr> | 164 | </tr> |
| 3667 | 181 | </blockTable> | 165 | </blockTable> |
| 3668 | @@ -184,12 +168,12 @@ | |||
| 3669 | 184 | </para> | 168 | </para> |
| 3670 | 185 | <blockTable colWidths="90.0,80.0,80.0,130.0,80.0,80.0" style="Table2_header"> | 169 | <blockTable colWidths="90.0,80.0,80.0,130.0,80.0,80.0" style="Table2_header"> |
| 3671 | 186 | <tr> | 170 | <tr> |
| 3678 | 187 | <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td> | 171 | <td><para style="terp_tblheader_General_Centre"><b>Chart of Accounts</b></para></td> |
| 3679 | 188 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> | 172 | <td><para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para></td> |
| 3680 | 189 | <td><para style="terp_tblheader_General_Centre">Journals</para></td> | 173 | <td><para style="terp_tblheader_General_Centre"><b>Journals</b></para></td> |
| 3681 | 190 | <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td> | 174 | <td><para style="terp_tblheader_General_Centre"><b>Filter By </b> [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td> |
| 3682 | 191 | <td><para style="terp_tblheader_General_Centre">Partner's</para></td> | 175 | <td><para style="terp_tblheader_General_Centre"><b>Partner's</b></para></td> |
| 3683 | 192 | <td><para style="terp_tblheader_General_Centre">Target Moves</para></td> | 176 | <td><para style="terp_tblheader_General_Centre"><b>Target Moves</b></para></td> |
| 3684 | 193 | </tr> | 177 | </tr> |
| 3685 | 194 | <tr> | 178 | <tr> |
| 3686 | 195 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> | 179 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> |
| 3687 | @@ -199,8 +183,8 @@ | |||
| 3688 | 199 | <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para> | 183 | <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para> |
| 3689 | 200 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] | 184 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] |
| 3690 | 201 | <tr> | 185 | <tr> |
| 3693 | 202 | <td><para style="terp_tblheader_General_Centre">Start Date</para></td> | 186 | <td><para style="terp_tblheader_General_Centre"><b>Start Date</b></para></td> |
| 3694 | 203 | <td><para style="terp_tblheader_General_Centre">End Date</para></td> | 187 | <td><para style="terp_tblheader_General_Centre"><b>End Date</b></para></td> |
| 3695 | 204 | </tr> | 188 | </tr> |
| 3696 | 205 | <tr> | 189 | <tr> |
| 3697 | 206 | <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td> | 190 | <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td> |
| 3698 | @@ -209,8 +193,8 @@ | |||
| 3699 | 209 | </blockTable> | 193 | </blockTable> |
| 3700 | 210 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] | 194 | <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] |
| 3701 | 211 | <tr> | 195 | <tr> |
| 3704 | 212 | <td><para style="terp_tblheader_General_Centre">Start Period</para></td> | 196 | <td><para style="terp_tblheader_General_Centre"><b>Start Period</b></para></td> |
| 3705 | 213 | <td><para style="terp_tblheader_General_Centre">End Period</para></td> | 197 | <td><para style="terp_tblheader_General_Centre"><b>End Period</b></para></td> |
| 3706 | 214 | </tr> | 198 | </tr> |
| 3707 | 215 | <tr> | 199 | <tr> |
| 3708 | 216 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td> | 200 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td> |
| 3709 | @@ -229,15 +213,15 @@ | |||
| 3710 | 229 | <para style="P12a"></para> | 213 | <para style="P12a"></para> |
| 3711 | 230 | <blockTable colWidths="80.0,140.0,80.0,80.0,80.0,80.0" repeatRows="1" style="Table2"> | 214 | <blockTable colWidths="80.0,140.0,80.0,80.0,80.0,80.0" repeatRows="1" style="Table2"> |
| 3712 | 231 | <tr> | 215 | <tr> |
| 3719 | 232 | <td><para style="P12a">Code</para></td> | 216 | <td><para style="P12a"><b>Code</b></para></td> |
| 3720 | 233 | <td><para style="P12a">(Account/Partner) Name</para></td> | 217 | <td><para style="P12a"><b>(Account/Partner) Name</b></para></td> |
| 3721 | 234 | <td><para style="P12b">Debit</para></td> | 218 | <td><para style="P12b"><b>Debit</b></para></td> |
| 3722 | 235 | <td><para style="P12b">Credit</para></td> | 219 | <td><para style="P12b"><b>Credit</b></para></td> |
| 3723 | 236 | <td><para style="P12b">Balance</para></td> | 220 | <td><para style="P12b"><b>Balance</b></para></td> |
| 3724 | 237 | <td><para style="P12b">In dispute</para></td> | 221 | <td><para style="P12b"><b>In dispute</b></para></td> |
| 3725 | 238 | </tr> | 222 | </tr> |
| 3726 | 239 | <tr> | 223 | <tr> |
| 3728 | 240 | <td><para style="P7">Total:</para></td> | 224 | <td><para style="P7"><b>Total:</b></para></td> |
| 3729 | 241 | <td><para style="P8"></para></td> | 225 | <td><para style="P8"></para></td> |
| 3730 | 242 | <td><para style="P8"><u>[[ formatLang(sum_debit()) ]]</u></para></td> | 226 | <td><para style="P8"><u>[[ formatLang(sum_debit()) ]]</u></para></td> |
| 3731 | 243 | <td><para style="P8"><u>[[ formatLang(sum_credit()) ]]</u></para></td> | 227 | <td><para style="P8"><u>[[ formatLang(sum_credit()) ]]</u></para></td> |
| 3732 | @@ -245,12 +229,12 @@ | |||
| 3733 | 245 | <td><para style="P8"><u>[[ formatLang(sum_litige(), currency_obj=company.currency_id) ]]</u></para></td> | 229 | <td><para style="P8"><u>[[ formatLang(sum_litige(), currency_obj=company.currency_id) ]]</u></para></td> |
| 3734 | 246 | </tr> | 230 | </tr> |
| 3735 | 247 | <tr> | 231 | <tr> |
| 3742 | 248 | <td><para style="P3">[[ repeatIn(lines(), 'a') ]]<font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td> | 232 | <td><para style="P3">[[ repeatIn(lines(), 'a') ]]<font>[[ a['type']==3 and removeParentNode('font') ]]</font><font>[[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td> |
| 3743 | 249 | <td><para style="P3"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para></td> | 233 | <td><para style="P3"><font>[[ a['type']==3 and removeParentNode('font') ]]</font>[[ a['name'] ]]</para></td> |
| 3744 | 250 | <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['debit']) ]]</para></td> | 234 | <td><para style="P4"><font>[[ a['type']==3 and removeParentNode('font') ]]</font>[[ formatLang(a['debit']) ]]</para></td> |
| 3745 | 251 | <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['credit']) ]]</para></td> | 235 | <td><para style="P4"><font>[[ a['type']==3 and removeParentNode('font') ]]</font>[[ formatLang(a['credit']) ]]</para></td> |
| 3746 | 252 | <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</para></td> | 236 | <td><para style="P4"><font>[[ a['type']==3 and removeParentNode('font') ]]</font>[[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</para></td> |
| 3747 | 253 | <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.0, currency_obj=company.currency_id) ]]</para></td> | 237 | <td><para style="P4"><font>[[ a['type']==3 and removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.0, currency_obj=company.currency_id) ]]</para></td> |
| 3748 | 254 | </tr> | 238 | </tr> |
| 3749 | 255 | </blockTable> | 239 | </blockTable> |
| 3750 | 256 | </story> | 240 | </story> |
| 3751 | 257 | 241 | ||
| 3752 | === modified file 'account/report/account_partner_ledger.rml' | |||
| 3753 | --- account/report/account_partner_ledger.rml 2013-06-14 21:36:02 +0000 | |||
| 3754 | +++ account/report/account_partner_ledger.rml 2013-08-13 05:40:59 +0000 | |||
| 3755 | @@ -236,39 +236,39 @@ | |||
| 3756 | 236 | <initialize> | 236 | <initialize> |
| 3757 | 237 | <paraStyle name="all" alignment="justify"/> | 237 | <paraStyle name="all" alignment="justify"/> |
| 3758 | 238 | </initialize> | 238 | </initialize> |
| 3792 | 239 | <paraStyle name="Standard" fontName="Helvetica"/> | 239 | <paraStyle name="Standard"/> |
| 3793 | 240 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 240 | <paraStyle name="Heading" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3794 | 241 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 241 | <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/> |
| 3795 | 242 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 242 | <paraStyle name="List" spaceBefore="0.0" spaceAfter="6.0"/> |
| 3796 | 243 | <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/> | 243 | <paraStyle name="Caption" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3797 | 244 | <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/> | 244 | <paraStyle name="Index" fontSize="9.0" leading="11"/> |
| 3798 | 245 | <paraStyle name="Footer" fontName="Helvetica"/> | 245 | <paraStyle name="Footer"/> |
| 3799 | 246 | <paraStyle name="Table Contents" fontName="Helvetica"/> | 246 | <paraStyle name="Table Contents"/> |
| 3800 | 247 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/> | 247 | <paraStyle name="Table Heading" alignment="CENTER"/> |
| 3801 | 248 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 248 | <paraStyle name="Horizontal Line" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> |
| 3802 | 249 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 249 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3803 | 250 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 250 | <paraStyle name="Heading 9" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3804 | 251 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 251 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3805 | 252 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 252 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3806 | 253 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 253 | <paraStyle name="terp_default_8" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3807 | 254 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 254 | <paraStyle name="terp_default_Bold_8" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3808 | 255 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 255 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3809 | 256 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 256 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3810 | 257 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 257 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3811 | 258 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 258 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 3812 | 259 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 259 | <paraStyle name="terp_default_Right_8" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3813 | 260 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 260 | <paraStyle name="terp_default_Centre_8" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3814 | 261 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 261 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3815 | 262 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | 262 | <paraStyle name="terp_header_Centre" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3816 | 263 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 263 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3817 | 264 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 264 | <paraStyle name="terp_default_9" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3818 | 265 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 265 | <paraStyle name="terp_default_Bold_9" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3819 | 266 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 266 | <paraStyle name="terp_default_Centre_9" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3820 | 267 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 267 | <paraStyle name="terp_default_Right_9" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3821 | 268 | <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 268 | <paraStyle name="terp_default_9_italic" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3822 | 269 | <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 269 | <paraStyle name="terp_default_Bold_9_Right" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3823 | 270 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 270 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 3824 | 271 | <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> | 271 | <paraStyle name="Heading 3" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> |
| 3825 | 272 | <images/> | 272 | <images/> |
| 3826 | 273 | </stylesheet> | 273 | </stylesheet> |
| 3827 | 274 | <story> | 274 | <story> |
| 3828 | @@ -277,59 +277,59 @@ | |||
| 3829 | 277 | <blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2"> | 277 | <blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2"> |
| 3830 | 278 | <tr> | 278 | <tr> |
| 3831 | 279 | <td> | 279 | <td> |
| 3854 | 280 | <para style="terp_tblheader_Details">Date</para> | 280 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 3855 | 281 | </td> | 281 | </td> |
| 3856 | 282 | <td> | 282 | <td> |
| 3857 | 283 | <para style="terp_tblheader_Details">JRNL</para> | 283 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 3858 | 284 | </td> | 284 | </td> |
| 3859 | 285 | <td> | 285 | <td> |
| 3860 | 286 | <para style="terp_tblheader_Details_Centre">Ref</para> | 286 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 3861 | 287 | </td> | 287 | </td> |
| 3862 | 288 | <td> | 288 | <td> |
| 3863 | 289 | <para style="terp_tblheader_Details_Centre">Account</para> | 289 | <para style="terp_tblheader_Details_Centre"><b>Account</b></para> |
| 3864 | 290 | </td> | 290 | </td> |
| 3865 | 291 | <td> | 291 | <td> |
| 3866 | 292 | <para style="terp_tblheader_Details">Entry Label</para> | 292 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 3867 | 293 | </td> | 293 | </td> |
| 3868 | 294 | <td> | 294 | <td> |
| 3869 | 295 | <para style="terp_tblheader_Details_Right">Debit</para> | 295 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 3870 | 296 | </td> | 296 | </td> |
| 3871 | 297 | <td> | 297 | <td> |
| 3872 | 298 | <para style="terp_tblheader_Details_Right">Credit</para> | 298 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 3873 | 299 | </td> | 299 | </td> |
| 3874 | 300 | <td> | 300 | <td> |
| 3875 | 301 | <para style="terp_tblheader_Details_Right">Balance</para> | 301 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 3876 | 302 | </td> | 302 | </td> |
| 3877 | 303 | </tr> | 303 | </tr> |
| 3878 | 304 | </blockTable> | 304 | </blockTable> |
| 3879 | 305 | <blockTable colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table8"> | 305 | <blockTable colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table8"> |
| 3880 | 306 | <tr> | 306 | <tr> |
| 3881 | 307 | <td> | 307 | <td> |
| 3907 | 308 | <para style="terp_tblheader_Details">Date</para> | 308 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 3908 | 309 | </td> | 309 | </td> |
| 3909 | 310 | <td> | 310 | <td> |
| 3910 | 311 | <para style="terp_tblheader_Details">JRNL</para> | 311 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 3911 | 312 | </td> | 312 | </td> |
| 3912 | 313 | <td> | 313 | <td> |
| 3913 | 314 | <para style="terp_tblheader_Details_Centre">Ref</para> | 314 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 3914 | 315 | </td> | 315 | </td> |
| 3915 | 316 | <td> | 316 | <td> |
| 3916 | 317 | <para style="terp_tblheader_Details_Centre">Account</para> | 317 | <para style="terp_tblheader_Details_Centre"><b>Account</b></para> |
| 3917 | 318 | </td> | 318 | </td> |
| 3918 | 319 | <td> | 319 | <td> |
| 3919 | 320 | <para style="terp_tblheader_Details">Entry Label</para> | 320 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 3920 | 321 | </td> | 321 | </td> |
| 3921 | 322 | <td> | 322 | <td> |
| 3922 | 323 | <para style="terp_tblheader_Details_Right">Debit</para> | 323 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 3923 | 324 | </td> | 324 | </td> |
| 3924 | 325 | <td> | 325 | <td> |
| 3925 | 326 | <para style="terp_tblheader_Details_Right">Credit</para> | 326 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 3926 | 327 | </td> | 327 | </td> |
| 3927 | 328 | <td> | 328 | <td> |
| 3928 | 329 | <para style="terp_tblheader_Details_Right">Balance</para> | 329 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 3929 | 330 | </td> | 330 | </td> |
| 3930 | 331 | <td> | 331 | <td> |
| 3931 | 332 | <para style="terp_tblheader_Details_Right">Currency</para> | 332 | <para style="terp_tblheader_Details_Right"><b>Currency</b></para> |
| 3932 | 333 | </td> | 333 | </td> |
| 3933 | 334 | </tr> | 334 | </tr> |
| 3934 | 335 | </blockTable> | 335 | </blockTable> |
| 3935 | @@ -346,22 +346,22 @@ | |||
| 3936 | 346 | <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1"> | 346 | <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1"> |
| 3937 | 347 | <tr> | 347 | <tr> |
| 3938 | 348 | <td> | 348 | <td> |
| 3955 | 349 | <para style="terp_tblheader_General_Centre">Chart of Accounts</para> | 349 | <para style="terp_tblheader_General_Centre"><b>Chart of Accounts</b></para> |
| 3956 | 350 | </td> | 350 | </td> |
| 3957 | 351 | <td> | 351 | <td> |
| 3958 | 352 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> | 352 | <para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para> |
| 3959 | 353 | </td> | 353 | </td> |
| 3960 | 354 | <td> | 354 | <td> |
| 3961 | 355 | <para style="terp_tblheader_General_Centre">Journals</para> | 355 | <para style="terp_tblheader_General_Centre"><b>Journals</b></para> |
| 3962 | 356 | </td> | 356 | </td> |
| 3963 | 357 | <td> | 357 | <td> |
| 3964 | 358 | <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para> | 358 | <para style="terp_tblheader_General_Centre"><b>Filters By </b> [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para> |
| 3965 | 359 | </td> | 359 | </td> |
| 3966 | 360 | <td> | 360 | <td> |
| 3967 | 361 | <para style="terp_tblheader_General_Centre">Partner's</para> | 361 | <para style="terp_tblheader_General_Centre"><b>Partner's</b></para> |
| 3968 | 362 | </td> | 362 | </td> |
| 3969 | 363 | <td> | 363 | <td> |
| 3970 | 364 | <para style="terp_tblheader_General_Centre">Target Moves</para> | 364 | <para style="terp_tblheader_General_Centre"><b>Target Moves</b></para> |
| 3971 | 365 | </td> | 365 | </td> |
| 3972 | 366 | </tr> | 366 | </tr> |
| 3973 | 367 | </blockTable> | 367 | </blockTable> |
| 3974 | @@ -381,10 +381,10 @@ | |||
| 3975 | 381 | <blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] | 381 | <blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] |
| 3976 | 382 | <tr> | 382 | <tr> |
| 3977 | 383 | <td> | 383 | <td> |
| 3979 | 384 | <para style="terp_tblheader_General_Centre">Start Date</para> | 384 | <para style="terp_tblheader_General_Centre"><b>Start Date</b></para> |
| 3980 | 385 | </td> | 385 | </td> |
| 3981 | 386 | <td> | 386 | <td> |
| 3983 | 387 | <para style="terp_tblheader_General_Centre">End Date</para> | 387 | <para style="terp_tblheader_General_Centre"><b>End Date</b></para> |
| 3984 | 388 | </td> | 388 | </td> |
| 3985 | 389 | </tr> | 389 | </tr> |
| 3986 | 390 | </blockTable> | 390 | </blockTable> |
| 3987 | @@ -401,10 +401,10 @@ | |||
| 3988 | 401 | <blockTable colWidths="58.0,58.0" style="Table10">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] | 401 | <blockTable colWidths="58.0,58.0" style="Table10">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] |
| 3989 | 402 | <tr> | 402 | <tr> |
| 3990 | 403 | <td> | 403 | <td> |
| 3992 | 404 | <para style="terp_tblheader_General_Centre">Start Period</para> | 404 | <para style="terp_tblheader_General_Centre"><b>Start Period</b></para> |
| 3993 | 405 | </td> | 405 | </td> |
| 3994 | 406 | <td> | 406 | <td> |
| 3996 | 407 | <para style="terp_tblheader_General_Centre">End Period</para> | 407 | <para style="terp_tblheader_General_Centre"><b>End Period</b></para> |
| 3997 | 408 | </td> | 408 | </td> |
| 3998 | 409 | </tr> | 409 | </tr> |
| 3999 | 410 | </blockTable> | 410 | </blockTable> |
| 4000 | @@ -442,44 +442,44 @@ | |||
| 4001 | 442 | <blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2"> | 442 | <blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2"> |
| 4002 | 443 | <tr> | 443 | <tr> |
| 4003 | 444 | <td> | 444 | <td> |
| 4026 | 445 | <para style="terp_tblheader_Details">Date</para> | 445 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 4027 | 446 | </td> | 446 | </td> |
| 4028 | 447 | <td> | 447 | <td> |
| 4029 | 448 | <para style="terp_tblheader_Details">JRNL</para> | 448 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 4030 | 449 | </td> | 449 | </td> |
| 4031 | 450 | <td> | 450 | <td> |
| 4032 | 451 | <para style="terp_tblheader_Details_Centre">Ref</para> | 451 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 4033 | 452 | </td> | 452 | </td> |
| 4034 | 453 | <td> | 453 | <td> |
| 4035 | 454 | <para style="terp_tblheader_Details_Centre">Account</para> | 454 | <para style="terp_tblheader_Details_Centre"><b>Account</b></para> |
| 4036 | 455 | </td> | 455 | </td> |
| 4037 | 456 | <td> | 456 | <td> |
| 4038 | 457 | <para style="terp_tblheader_Details">Entry Label</para> | 457 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 4039 | 458 | </td> | 458 | </td> |
| 4040 | 459 | <td> | 459 | <td> |
| 4041 | 460 | <para style="terp_tblheader_Details_Right">Debit</para> | 460 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 4042 | 461 | </td> | 461 | </td> |
| 4043 | 462 | <td> | 462 | <td> |
| 4044 | 463 | <para style="terp_tblheader_Details_Right">Credit</para> | 463 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 4045 | 464 | </td> | 464 | </td> |
| 4046 | 465 | <td> | 465 | <td> |
| 4047 | 466 | <para style="terp_tblheader_Details_Right">Balance</para> | 466 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 4048 | 467 | </td> | 467 | </td> |
| 4049 | 468 | </tr> | 468 | </tr> |
| 4050 | 469 | </blockTable> | 469 | </blockTable> |
| 4051 | 470 | <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table3"> | 470 | <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table3"> |
| 4052 | 471 | <tr> | 471 | <tr> |
| 4053 | 472 | <td> | 472 | <td> |
| 4064 | 473 | <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para> | 473 | <para style="terp_default_Bold_9"><b>[[ p.ref ]] - [[ p.name ]]</b></para> |
| 4065 | 474 | </td> | 474 | </td> |
| 4066 | 475 | <td> | 475 | <td> |
| 4067 | 476 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p))) ]]</para> | 476 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_debit_partner(p))) ]]</b></para> |
| 4068 | 477 | </td> | 477 | </td> |
| 4069 | 478 | <td> | 478 | <td> |
| 4070 | 479 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para> | 479 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_credit_partner(p))) ]]</b></para> |
| 4071 | 480 | </td> | 480 | </td> |
| 4072 | 481 | <td> | 481 | <td> |
| 4073 | 482 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</para> | 482 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</b></para> |
| 4074 | 483 | </td> | 483 | </td> |
| 4075 | 484 | </tr> | 484 | </tr> |
| 4076 | 485 | </blockTable> | 485 | </blockTable> |
| 4077 | @@ -543,47 +543,47 @@ | |||
| 4078 | 543 | <blockTable colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table8"> | 543 | <blockTable colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table8"> |
| 4079 | 544 | <tr> | 544 | <tr> |
| 4080 | 545 | <td> | 545 | <td> |
| 4106 | 546 | <para style="terp_tblheader_Details">Date</para> | 546 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 4107 | 547 | </td> | 547 | </td> |
| 4108 | 548 | <td> | 548 | <td> |
| 4109 | 549 | <para style="terp_tblheader_Details">JRNL</para> | 549 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 4110 | 550 | </td> | 550 | </td> |
| 4111 | 551 | <td> | 551 | <td> |
| 4112 | 552 | <para style="terp_tblheader_Details_Centre">Ref</para> | 552 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 4113 | 553 | </td> | 553 | </td> |
| 4114 | 554 | <td> | 554 | <td> |
| 4115 | 555 | <para style="terp_tblheader_Details_Centre">Account</para> | 555 | <para style="terp_tblheader_Details_Centre"><b>Account</b></para> |
| 4116 | 556 | </td> | 556 | </td> |
| 4117 | 557 | <td> | 557 | <td> |
| 4118 | 558 | <para style="terp_tblheader_Details">Entry Label</para> | 558 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 4119 | 559 | </td> | 559 | </td> |
| 4120 | 560 | <td> | 560 | <td> |
| 4121 | 561 | <para style="terp_tblheader_Details_Right">Debit</para> | 561 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 4122 | 562 | </td> | 562 | </td> |
| 4123 | 563 | <td> | 563 | <td> |
| 4124 | 564 | <para style="terp_tblheader_Details_Right">Credit</para> | 564 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 4125 | 565 | </td> | 565 | </td> |
| 4126 | 566 | <td> | 566 | <td> |
| 4127 | 567 | <para style="terp_tblheader_Details_Right">Balance</para> | 567 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 4128 | 568 | </td> | 568 | </td> |
| 4129 | 569 | <td> | 569 | <td> |
| 4130 | 570 | <para style="terp_tblheader_Details_Right">Currency</para> | 570 | <para style="terp_tblheader_Details_Right"><b>Currency></b></para> |
| 4131 | 571 | </td> | 571 | </td> |
| 4132 | 572 | </tr> | 572 | </tr> |
| 4133 | 573 | </blockTable> | 573 | </blockTable> |
| 4134 | 574 | <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table12"> | 574 | <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table12"> |
| 4135 | 575 | <tr> | 575 | <tr> |
| 4136 | 576 | <td> | 576 | <td> |
| 4147 | 577 | <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para> | 577 | <para style="terp_default_Bold_9"><b>[[ p.ref ]] - [[ p.name ]]</b></para> |
| 4148 | 578 | </td> | 578 | </td> |
| 4149 | 579 | <td> | 579 | <td> |
| 4150 | 580 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p))) ]]</para> | 580 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_debit_partner(p))) ]]</b></para> |
| 4151 | 581 | </td> | 581 | </td> |
| 4152 | 582 | <td> | 582 | <td> |
| 4153 | 583 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para> | 583 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_credit_partner(p))) ]]</b></para> |
| 4154 | 584 | </td> | 584 | </td> |
| 4155 | 585 | <td> | 585 | <td> |
| 4156 | 586 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]] </para> | 586 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</b></para> |
| 4157 | 587 | </td> | 587 | </td> |
| 4158 | 588 | <td> | 588 | <td> |
| 4159 | 589 | <para style="terp_default_Bold_9_Right"> | 589 | <para style="terp_default_Bold_9_Right"> |
| 4160 | 590 | 590 | ||
| 4161 | === modified file 'account/report/account_partner_ledger_other.rml' | |||
| 4162 | --- account/report/account_partner_ledger_other.rml 2012-06-13 09:06:00 +0000 | |||
| 4163 | +++ account/report/account_partner_ledger_other.rml 2013-08-13 05:40:59 +0000 | |||
| 4164 | @@ -236,39 +236,27 @@ | |||
| 4165 | 236 | <initialize> | 236 | <initialize> |
| 4166 | 237 | <paraStyle name="all" alignment="justify"/> | 237 | <paraStyle name="all" alignment="justify"/> |
| 4167 | 238 | </initialize> | 238 | </initialize> |
| 4201 | 239 | <paraStyle name="Standard" fontName="Helvetica"/> | 239 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 4202 | 240 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 240 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4203 | 241 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 241 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4204 | 242 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 242 | <paraStyle name="terp_default_8" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4205 | 243 | <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/> | 243 | <paraStyle name="terp_default_Bold_8" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4206 | 244 | <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/> | 244 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4207 | 245 | <paraStyle name="Footer" fontName="Helvetica"/> | 245 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4208 | 246 | <paraStyle name="Table Contents" fontName="Helvetica"/> | 246 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4209 | 247 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/> | 247 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4210 | 248 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 248 | <paraStyle name="terp_default_Right_8" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4211 | 249 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 249 | <paraStyle name="terp_default_Centre_8" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4212 | 250 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 250 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 4213 | 251 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 251 | <paraStyle name="terp_header_Centre" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 4214 | 252 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 252 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4215 | 253 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 253 | <paraStyle name="terp_default_9" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4216 | 254 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 254 | <paraStyle name="terp_default_Bold_9" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4217 | 255 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 255 | <paraStyle name="terp_default_Centre_9" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4218 | 256 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 256 | <paraStyle name="terp_default_Right_9" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4219 | 257 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 257 | <paraStyle name="terp_default_9_italic" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4220 | 258 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 258 | <paraStyle name="terp_default_Bold_9_Right" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4221 | 259 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 259 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4189 | 260 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4190 | 261 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 4191 | 262 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 4192 | 263 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4193 | 264 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4194 | 265 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4195 | 266 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4196 | 267 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4197 | 268 | <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4198 | 269 | <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4199 | 270 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4200 | 271 | <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 4222 | 272 | <images/> | 260 | <images/> |
| 4223 | 273 | </stylesheet> | 261 | </stylesheet> |
| 4224 | 274 | <story> | 262 | <story> |
| 4225 | @@ -278,28 +266,28 @@ | |||
| 4226 | 278 | [[ display_currency(data) == False or removeParentNode('blockTable') ]] | 266 | [[ display_currency(data) == False or removeParentNode('blockTable') ]] |
| 4227 | 279 | <tr> | 267 | <tr> |
| 4228 | 280 | <td> | 268 | <td> |
| 4251 | 281 | <para style="terp_tblheader_Details">Date</para> | 269 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 4252 | 282 | </td> | 270 | </td> |
| 4253 | 283 | <td> | 271 | <td> |
| 4254 | 284 | <para style="terp_tblheader_Details">JRNL</para> | 272 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 4255 | 285 | </td> | 273 | </td> |
| 4256 | 286 | <td> | 274 | <td> |
| 4257 | 287 | <para style="terp_tblheader_Details_Centre">Ref</para> | 275 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 4258 | 288 | </td> | 276 | </td> |
| 4259 | 289 | <td> | 277 | <td> |
| 4260 | 290 | <para style="terp_tblheader_Details_Centre">Account</para> | 278 | <para style="terp_tblheader_Details_Centre"><b>Account</b></para> |
| 4261 | 291 | </td> | 279 | </td> |
| 4262 | 292 | <td> | 280 | <td> |
| 4263 | 293 | <para style="terp_tblheader_Details">Entry Label</para> | 281 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 4264 | 294 | </td> | 282 | </td> |
| 4265 | 295 | <td> | 283 | <td> |
| 4266 | 296 | <para style="terp_tblheader_Details_Right">Debit</para> | 284 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 4267 | 297 | </td> | 285 | </td> |
| 4268 | 298 | <td> | 286 | <td> |
| 4269 | 299 | <para style="terp_tblheader_Details_Right">Credit</para> | 287 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 4270 | 300 | </td> | 288 | </td> |
| 4271 | 301 | <td> | 289 | <td> |
| 4272 | 302 | <para style="terp_tblheader_Details_Right">Balance</para> | 290 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 4273 | 303 | </td> | 291 | </td> |
| 4274 | 304 | </tr> | 292 | </tr> |
| 4275 | 305 | </blockTable> | 293 | </blockTable> |
| 4276 | @@ -307,31 +295,31 @@ | |||
| 4277 | 307 | [[ display_currency(data) == True or removeParentNode('blockTable') ]] | 295 | [[ display_currency(data) == True or removeParentNode('blockTable') ]] |
| 4278 | 308 | <tr> | 296 | <tr> |
| 4279 | 309 | <td> | 297 | <td> |
| 4305 | 310 | <para style="terp_tblheader_Details">Date</para> | 298 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 4306 | 311 | </td> | 299 | </td> |
| 4307 | 312 | <td> | 300 | <td> |
| 4308 | 313 | <para style="terp_tblheader_Details">JRNL</para> | 301 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 4309 | 314 | </td> | 302 | </td> |
| 4310 | 315 | <td> | 303 | <td> |
| 4311 | 316 | <para style="terp_tblheader_Details_Centre">Ref</para> | 304 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 4312 | 317 | </td> | 305 | </td> |
| 4313 | 318 | <td> | 306 | <td> |
| 4314 | 319 | <para style="terp_tblheader_Details_Centre">Account</para> | 307 | <para style="terp_tblheader_Details_Centre"><b>Account</b></para> |
| 4315 | 320 | </td> | 308 | </td> |
| 4316 | 321 | <td> | 309 | <td> |
| 4317 | 322 | <para style="terp_tblheader_Details">Entry Label</para> | 310 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 4318 | 323 | </td> | 311 | </td> |
| 4319 | 324 | <td> | 312 | <td> |
| 4320 | 325 | <para style="terp_tblheader_Details_Right">Debit</para> | 313 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 4321 | 326 | </td> | 314 | </td> |
| 4322 | 327 | <td> | 315 | <td> |
| 4323 | 328 | <para style="terp_tblheader_Details_Right">Credit</para> | 316 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 4324 | 329 | </td> | 317 | </td> |
| 4325 | 330 | <td> | 318 | <td> |
| 4326 | 331 | <para style="terp_tblheader_Details_Right">Balance</para> | 319 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 4327 | 332 | </td> | 320 | </td> |
| 4328 | 333 | <td> | 321 | <td> |
| 4329 | 334 | <para style="terp_tblheader_Details_Right">Currency</para> | 322 | <para style="terp_tblheader_Details_Right"><b>Currency</b></para> |
| 4330 | 335 | </td> | 323 | </td> |
| 4331 | 336 | </tr> | 324 | </tr> |
| 4332 | 337 | </blockTable> | 325 | </blockTable> |
| 4333 | @@ -340,29 +328,29 @@ | |||
| 4334 | 340 | <para style="terp_default_8"> | 328 | <para style="terp_default_8"> |
| 4335 | 341 | <font color="white"> </font> | 329 | <font color="white"> </font> |
| 4336 | 342 | </para> | 330 | </para> |
| 4338 | 343 | <para style="terp_header_Centre">Partner Ledger</para> | 331 | <para style="terp_header_Centre"><b>Partner Ledger</b></para> |
| 4339 | 344 | <para style="terp_default_8"> | 332 | <para style="terp_default_8"> |
| 4340 | 345 | <font color="white"> </font> | 333 | <font color="white"> </font> |
| 4341 | 346 | </para> | 334 | </para> |
| 4342 | 347 | <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1"> | 335 | <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1"> |
| 4343 | 348 | <tr> | 336 | <tr> |
| 4344 | 349 | <td> | 337 | <td> |
| 4361 | 350 | <para style="terp_tblheader_General_Centre">Chart of Accounts</para> | 338 | <para style="terp_tblheader_General_Centre"><b>Chart of Accounts</b></para> |
| 4362 | 351 | </td> | 339 | </td> |
| 4363 | 352 | <td> | 340 | <td> |
| 4364 | 353 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> | 341 | <para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para> |
| 4365 | 354 | </td> | 342 | </td> |
| 4366 | 355 | <td> | 343 | <td> |
| 4367 | 356 | <para style="terp_tblheader_General_Centre">Journals</para> | 344 | <para style="terp_tblheader_General_Centre"><b>Journals</b></para> |
| 4368 | 357 | </td> | 345 | </td> |
| 4369 | 358 | <td> | 346 | <td> |
| 4370 | 359 | <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para> | 347 | <para style="terp_tblheader_General_Centre"><b>Filters By </b> [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para> |
| 4371 | 360 | </td> | 348 | </td> |
| 4372 | 361 | <td> | 349 | <td> |
| 4373 | 362 | <para style="terp_tblheader_General_Centre">Partner's</para> | 350 | <para style="terp_tblheader_General_Centre"><b>Partner's</b></para> |
| 4374 | 363 | </td> | 351 | </td> |
| 4375 | 364 | <td> | 352 | <td> |
| 4376 | 365 | <para style="terp_tblheader_General_Centre">Target Moves</para> | 353 | <para style="terp_tblheader_General_Centre"><b>Target Moves</b></para> |
| 4377 | 366 | </td> | 354 | </td> |
| 4378 | 367 | </tr> | 355 | </tr> |
| 4379 | 368 | </blockTable> | 356 | </blockTable> |
| 4380 | @@ -382,10 +370,10 @@ | |||
| 4381 | 382 | <blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] | 370 | <blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] |
| 4382 | 383 | <tr> | 371 | <tr> |
| 4383 | 384 | <td> | 372 | <td> |
| 4385 | 385 | <para style="terp_tblheader_General_Centre">Start Date</para> | 373 | <para style="terp_tblheader_General_Centre"><b>Start Date</b></para> |
| 4386 | 386 | </td> | 374 | </td> |
| 4387 | 387 | <td> | 375 | <td> |
| 4389 | 388 | <para style="terp_tblheader_General_Centre">End Date</para> | 376 | <para style="terp_tblheader_General_Centre"><b>End Date</b></para> |
| 4390 | 389 | </td> | 377 | </td> |
| 4391 | 390 | </tr> | 378 | </tr> |
| 4392 | 391 | </blockTable> | 379 | </blockTable> |
| 4393 | @@ -402,10 +390,10 @@ | |||
| 4394 | 402 | <blockTable colWidths="58.0,58.0" style="Table10">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] | 390 | <blockTable colWidths="58.0,58.0" style="Table10">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] |
| 4395 | 403 | <tr> | 391 | <tr> |
| 4396 | 404 | <td> | 392 | <td> |
| 4398 | 405 | <para style="terp_tblheader_General_Centre">Start Period</para> | 393 | <para style="terp_tblheader_General_Centre"><b>Start Period</b></para> |
| 4399 | 406 | </td> | 394 | </td> |
| 4400 | 407 | <td> | 395 | <td> |
| 4402 | 408 | <para style="terp_tblheader_General_Centre">End Period</para> | 396 | <para style="terp_tblheader_General_Centre"><b>End Period</b></para> |
| 4403 | 409 | </td> | 397 | </td> |
| 4404 | 410 | </tr> | 398 | </tr> |
| 4405 | 411 | </blockTable> | 399 | </blockTable> |
| 4406 | @@ -438,28 +426,28 @@ | |||
| 4407 | 438 | [[ display_currency(data) == False or removeParentNode('blockTable') ]] | 426 | [[ display_currency(data) == False or removeParentNode('blockTable') ]] |
| 4408 | 439 | <tr> | 427 | <tr> |
| 4409 | 440 | <td> | 428 | <td> |
| 4432 | 441 | <para style="terp_tblheader_Details">Date</para> | 429 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 4433 | 442 | </td> | 430 | </td> |
| 4434 | 443 | <td> | 431 | <td> |
| 4435 | 444 | <para style="terp_tblheader_Details">JRNL</para> | 432 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 4436 | 445 | </td> | 433 | </td> |
| 4437 | 446 | <td> | 434 | <td> |
| 4438 | 447 | <para style="terp_tblheader_Details_Centre">Ref</para> | 435 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 4439 | 448 | </td> | 436 | </td> |
| 4440 | 449 | <td> | 437 | <td> |
| 4441 | 450 | <para style="terp_tblheader_Details_Centre">Account</para> | 438 | <para style="terp_tblheader_Details_Centre"><b>Account</b></para> |
| 4442 | 451 | </td> | 439 | </td> |
| 4443 | 452 | <td> | 440 | <td> |
| 4444 | 453 | <para style="terp_tblheader_Details">Entry Label</para> | 441 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 4445 | 454 | </td> | 442 | </td> |
| 4446 | 455 | <td> | 443 | <td> |
| 4447 | 456 | <para style="terp_tblheader_Details_Right">Debit</para> | 444 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 4448 | 457 | </td> | 445 | </td> |
| 4449 | 458 | <td> | 446 | <td> |
| 4450 | 459 | <para style="terp_tblheader_Details_Right">Credit</para> | 447 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 4451 | 460 | </td> | 448 | </td> |
| 4452 | 461 | <td> | 449 | <td> |
| 4453 | 462 | <para style="terp_tblheader_Details_Right">Balance</para> | 450 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 4454 | 463 | </td> | 451 | </td> |
| 4455 | 464 | </tr> | 452 | </tr> |
| 4456 | 465 | </blockTable> | 453 | </blockTable> |
| 4457 | @@ -473,16 +461,16 @@ | |||
| 4458 | 473 | <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table3"> | 461 | <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table3"> |
| 4459 | 474 | <tr> | 462 | <tr> |
| 4460 | 475 | <td> | 463 | <td> |
| 4471 | 476 | <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para> | 464 | <para style="terp_default_Bold_9"><b>[[ p.ref ]] - [[ p.name ]]</b></para> |
| 4472 | 477 | </td> | 465 | </td> |
| 4473 | 478 | <td> | 466 | <td> |
| 4474 | 479 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p))) ]]</para> | 467 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_debit_partner(p))) ]]</b></para> |
| 4475 | 480 | </td> | 468 | </td> |
| 4476 | 481 | <td> | 469 | <td> |
| 4477 | 482 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para> | 470 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_credit_partner(p))) ]]</b></para> |
| 4478 | 483 | </td> | 471 | </td> |
| 4479 | 484 | <td> | 472 | <td> |
| 4480 | 485 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</para> | 473 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</b></para> |
| 4481 | 486 | </td> | 474 | </td> |
| 4482 | 487 | </tr> | 475 | </tr> |
| 4483 | 488 | </blockTable> | 476 | </blockTable> |
| 4484 | @@ -543,31 +531,31 @@ | |||
| 4485 | 543 | [[ display_currency(data) == True or removeParentNode('blockTable') ]] | 531 | [[ display_currency(data) == True or removeParentNode('blockTable') ]] |
| 4486 | 544 | <tr> | 532 | <tr> |
| 4487 | 545 | <td> | 533 | <td> |
| 4513 | 546 | <para style="terp_tblheader_Details">Date</para> | 534 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 4514 | 547 | </td> | 535 | </td> |
| 4515 | 548 | <td> | 536 | <td> |
| 4516 | 549 | <para style="terp_tblheader_Details">JRNL</para> | 537 | <para style="terp_tblheader_Details"><b>JRNL</b></para> |
| 4517 | 550 | </td> | 538 | </td> |
| 4518 | 551 | <td> | 539 | <td> |
| 4519 | 552 | <para style="terp_tblheader_Details_Centre">Ref</para> | 540 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 4520 | 553 | </td> | 541 | </td> |
| 4521 | 554 | <td> | 542 | <td> |
| 4522 | 555 | <para style="terp_tblheader_Details_Centre">Account</para> | 543 | <para style="terp_tblheader_Details_Centre"><b>Account</b></para> |
| 4523 | 556 | </td> | 544 | </td> |
| 4524 | 557 | <td> | 545 | <td> |
| 4525 | 558 | <para style="terp_tblheader_Details">Entry Label</para> | 546 | <para style="terp_tblheader_Details"><b>Entry Label</b></para> |
| 4526 | 559 | </td> | 547 | </td> |
| 4527 | 560 | <td> | 548 | <td> |
| 4528 | 561 | <para style="terp_tblheader_Details_Right">Debit</para> | 549 | <para style="terp_tblheader_Details_Right"><b>Debit</b></para> |
| 4529 | 562 | </td> | 550 | </td> |
| 4530 | 563 | <td> | 551 | <td> |
| 4531 | 564 | <para style="terp_tblheader_Details_Right">Credit</para> | 552 | <para style="terp_tblheader_Details_Right"><b>Credit</b></para> |
| 4532 | 565 | </td> | 553 | </td> |
| 4533 | 566 | <td> | 554 | <td> |
| 4534 | 567 | <para style="terp_tblheader_Details_Right">Balance</para> | 555 | <para style="terp_tblheader_Details_Right"><b>Balance</b></para> |
| 4535 | 568 | </td> | 556 | </td> |
| 4536 | 569 | <td> | 557 | <td> |
| 4537 | 570 | <para style="terp_tblheader_Details_Right">Currency</para> | 558 | <para style="terp_tblheader_Details_Right"><b>Currency</b></para> |
| 4538 | 571 | </td> | 559 | </td> |
| 4539 | 572 | </tr> | 560 | </tr> |
| 4540 | 573 | </blockTable> | 561 | </blockTable> |
| 4541 | @@ -581,16 +569,16 @@ | |||
| 4542 | 581 | <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table12"> | 569 | <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table12"> |
| 4543 | 582 | <tr> | 570 | <tr> |
| 4544 | 583 | <td> | 571 | <td> |
| 4555 | 584 | <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para> | 572 | <para style="terp_default_Bold_9"><b>[[ p.ref ]] - [[ p.name ]]</b></para> |
| 4556 | 585 | </td> | 573 | </td> |
| 4557 | 586 | <td> | 574 | <td> |
| 4558 | 587 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p))) ]]</para> | 575 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_debit_partner(p))) ]]</b></para> |
| 4559 | 588 | </td> | 576 | </td> |
| 4560 | 589 | <td> | 577 | <td> |
| 4561 | 590 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para> | 578 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_credit_partner(p))) ]]</b></para> |
| 4562 | 591 | </td> | 579 | </td> |
| 4563 | 592 | <td> | 580 | <td> |
| 4564 | 593 | <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</para> | 581 | <para style="terp_default_Bold_9_Right"><b>[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</b></para> |
| 4565 | 594 | </td> | 582 | </td> |
| 4566 | 595 | <td> | 583 | <td> |
| 4567 | 596 | <para style="terp_default_Bold_9_Right"> | 584 | <para style="terp_default_Bold_9_Right"> |
| 4568 | 597 | 585 | ||
| 4569 | === modified file 'account/report/account_print_invoice.rml' | |||
| 4570 | --- account/report/account_print_invoice.rml 2013-05-27 16:30:46 +0000 | |||
| 4571 | +++ account/report/account_print_invoice.rml 2013-08-13 05:40:59 +0000 | |||
| 4572 | @@ -99,17 +99,10 @@ | |||
| 4573 | 99 | <initialize> | 99 | <initialize> |
| 4574 | 100 | <paraStyle name="all" alignment="justify"/> | 100 | <paraStyle name="all" alignment="justify"/> |
| 4575 | 101 | </initialize> | 101 | </initialize> |
| 4576 | 102 | <paraStyle name="Standard"/> | ||
| 4577 | 103 | <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/> | 102 | <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/> |
| 4578 | 104 | <paraStyle name="List" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4579 | 105 | <paraStyle name="Table Contents" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4580 | 106 | <paraStyle name="Caption" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 4581 | 107 | <paraStyle name="Index"/> | ||
| 4582 | 108 | 103 | ||
| 4583 | 109 | <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 104 | <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 4584 | 110 | <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 105 | <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4585 | 111 | <paraStyle name="Footer"/> | ||
| 4586 | 112 | <paraStyle name="Horizontal Line" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | ||
| 4587 | 113 | 106 | ||
| 4588 | 114 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 107 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4589 | 115 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 108 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4590 | @@ -130,8 +123,6 @@ | |||
| 4591 | 130 | <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> | 123 | <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
| 4592 | 131 | 124 | ||
| 4593 | 132 | <paraStyle name="Table" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 125 | <paraStyle name="Table" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4594 | 133 | <paraStyle name="User Index 10" rightIndent="0.0" leftIndent="127.0"/> | ||
| 4595 | 134 | <paraStyle name="Preformatted Text" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4596 | 135 | <images/> | 126 | <images/> |
| 4597 | 136 | </stylesheet> | 127 | </stylesheet> |
| 4598 | 137 | <story> | 128 | <story> |
| 4599 | 138 | 129 | ||
| 4600 | === modified file 'account/report/account_print_overdue.rml' | |||
| 4601 | --- account/report/account_print_overdue.rml 2012-12-04 10:31:46 +0000 | |||
| 4602 | +++ account/report/account_print_overdue.rml 2013-08-13 05:40:59 +0000 | |||
| 4603 | @@ -57,36 +57,25 @@ | |||
| 4604 | 57 | <initialize> | 57 | <initialize> |
| 4605 | 58 | <paraStyle name="all" alignment="justify"/> | 58 | <paraStyle name="all" alignment="justify"/> |
| 4606 | 59 | </initialize> | 59 | </initialize> |
| 4637 | 60 | <paraStyle name="Standard" fontName="Helvetica"/> | 60 | <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 4638 | 61 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 61 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4639 | 62 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 62 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4640 | 63 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 63 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4641 | 64 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 64 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4642 | 65 | <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 65 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4643 | 66 | <paraStyle name="Index" fontName="Helvetica"/> | 66 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4644 | 67 | <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/> | 67 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4645 | 68 | <paraStyle name="Footer" fontName="Helvetica"/> | 68 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4646 | 69 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 69 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4647 | 70 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | 70 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4648 | 71 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 71 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
| 4649 | 72 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 72 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> |
| 4650 | 73 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 73 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4651 | 74 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 74 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4652 | 75 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 75 | <paraStyle name="terp_default_10" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="2.0"/> |
| 4653 | 76 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 76 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4654 | 77 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 77 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4655 | 78 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 78 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4626 | 79 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 4627 | 80 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4628 | 81 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4629 | 82 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 4630 | 83 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 4631 | 84 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4632 | 85 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4633 | 86 | <paraStyle name="terp_default_10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="2.0"/> | ||
| 4634 | 87 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4635 | 88 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4636 | 89 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4656 | 90 | <images/> | 79 | <images/> |
| 4657 | 91 | </stylesheet> | 80 | </stylesheet> |
| 4658 | 92 | <story> | 81 | <story> |
| 4659 | @@ -95,28 +84,28 @@ | |||
| 4660 | 95 | <blockTable colWidths="57.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1"> | 84 | <blockTable colWidths="57.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1"> |
| 4661 | 96 | <tr> | 85 | <tr> |
| 4662 | 97 | <td> | 86 | <td> |
| 4685 | 98 | <para style="terp_tblheader_Details">Date</para> | 87 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 4686 | 99 | </td> | 88 | </td> |
| 4687 | 100 | <td> | 89 | <td> |
| 4688 | 101 | <para style="terp_tblheader_Details">Description</para> | 90 | <para style="terp_tblheader_Details"><b>Description</b></para> |
| 4689 | 102 | </td> | 91 | </td> |
| 4690 | 103 | <td> | 92 | <td> |
| 4691 | 104 | <para style="terp_tblheader_Details_Centre">Ref</para> | 93 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 4692 | 105 | </td> | 94 | </td> |
| 4693 | 106 | <td> | 95 | <td> |
| 4694 | 107 | <para style="terp_tblheader_Details_Centre">Maturity date</para> | 96 | <para style="terp_tblheader_Details_Centre"><b>Maturity date</b></para> |
| 4695 | 108 | </td> | 97 | </td> |
| 4696 | 109 | <td> | 98 | <td> |
| 4697 | 110 | <para style="terp_tblheader_Details_Right">Due</para> | 99 | <para style="terp_tblheader_Details_Right"><b>Due</b></para> |
| 4698 | 111 | </td> | 100 | </td> |
| 4699 | 112 | <td> | 101 | <td> |
| 4700 | 113 | <para style="terp_tblheader_Details_Right">Paid</para> | 102 | <para style="terp_tblheader_Details_Right"><b>Paid</b></para> |
| 4701 | 114 | </td> | 103 | </td> |
| 4702 | 115 | <td> | 104 | <td> |
| 4703 | 116 | <para style="terp_tblheader_Details_Right">Maturity</para> | 105 | <para style="terp_tblheader_Details_Right"><b>Maturity</b></para> |
| 4704 | 117 | </td> | 106 | </td> |
| 4705 | 118 | <td> | 107 | <td> |
| 4706 | 119 | <para style="terp_tblheader_Details_Centre">Li.</para> | 108 | <para style="terp_tblheader_Details_Centre"><b>Li.</b></para> |
| 4707 | 120 | </td> | 109 | </td> |
| 4708 | 121 | </tr> | 110 | </tr> |
| 4709 | 122 | </blockTable> | 111 | </blockTable> |
| 4710 | @@ -164,28 +153,28 @@ | |||
| 4711 | 164 | <blockTable colWidths="56.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1"> | 153 | <blockTable colWidths="56.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1"> |
| 4712 | 165 | <tr> | 154 | <tr> |
| 4713 | 166 | <td> | 155 | <td> |
| 4736 | 167 | <para style="terp_tblheader_Details">Date</para> | 156 | <para style="terp_tblheader_Details"><b>Date</b></para> |
| 4737 | 168 | </td> | 157 | </td> |
| 4738 | 169 | <td> | 158 | <td> |
| 4739 | 170 | <para style="terp_tblheader_Details">Description</para> | 159 | <para style="terp_tblheader_Details"><b>Description</b></para> |
| 4740 | 171 | </td> | 160 | </td> |
| 4741 | 172 | <td> | 161 | <td> |
| 4742 | 173 | <para style="terp_tblheader_Details_Centre">Ref</para> | 162 | <para style="terp_tblheader_Details_Centre"><b>Ref</b></para> |
| 4743 | 174 | </td> | 163 | </td> |
| 4744 | 175 | <td> | 164 | <td> |
| 4745 | 176 | <para style="terp_tblheader_Details_Centre">Maturity date</para> | 165 | <para style="terp_tblheader_Details_Centre"><b>Maturity date</b></para> |
| 4746 | 177 | </td> | 166 | </td> |
| 4747 | 178 | <td> | 167 | <td> |
| 4748 | 179 | <para style="terp_tblheader_Details_Right">Due</para> | 168 | <para style="terp_tblheader_Details_Right"><b>Due</b></para> |
| 4749 | 180 | </td> | 169 | </td> |
| 4750 | 181 | <td> | 170 | <td> |
| 4751 | 182 | <para style="terp_tblheader_Details_Right">Paid</para> | 171 | <para style="terp_tblheader_Details_Right"><b>Paid</b></para> |
| 4752 | 183 | </td> | 172 | </td> |
| 4753 | 184 | <td> | 173 | <td> |
| 4754 | 185 | <para style="terp_tblheader_Details_Right">Maturity</para> | 174 | <para style="terp_tblheader_Details_Right"><b>Maturity</b></para> |
| 4755 | 186 | </td> | 175 | </td> |
| 4756 | 187 | <td> | 176 | <td> |
| 4757 | 188 | <para style="terp_tblheader_Details_Centre">Li.</para> | 177 | <para style="terp_tblheader_Details_Centre"><b>Li.</b></para> |
| 4758 | 189 | </td> | 178 | </td> |
| 4759 | 190 | </tr> | 179 | </tr> |
| 4760 | 191 | </blockTable> | 180 | </blockTable> |
| 4761 | @@ -227,7 +216,7 @@ | |||
| 4762 | 227 | </para> | 216 | </para> |
| 4763 | 228 | </td> | 217 | </td> |
| 4764 | 229 | <td> | 218 | <td> |
| 4766 | 230 | <para style="terp_default_Bold_9">Sub-Total :</para> | 219 | <para style="terp_default_Bold_9"><b>Sub-Total :</b></para> |
| 4767 | 231 | </td> | 220 | </td> |
| 4768 | 232 | <td> | 221 | <td> |
| 4769 | 233 | <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]] </para> | 222 | <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]] </para> |
| 4770 | @@ -253,10 +242,10 @@ | |||
| 4771 | 253 | </para> | 242 | </para> |
| 4772 | 254 | </td> | 243 | </td> |
| 4773 | 255 | <td> | 244 | <td> |
| 4775 | 256 | <para style="terp_default_Bold_9">Balance :</para> | 245 | <para style="terp_default_Bold_9"><b>Balance :</b></para> |
| 4776 | 257 | </td> | 246 | </td> |
| 4777 | 258 | <td> | 247 | <td> |
| 4779 | 259 | <para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0)), currency_obj = company.currency_id) ]]</para> | 248 | <para style="terp_tblheader_Details_Right"><b>[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0)), currency_obj = company.currency_id) ]]</b></para> |
| 4780 | 260 | </td> | 249 | </td> |
| 4781 | 261 | <td> | 250 | <td> |
| 4782 | 262 | <para style="terp_default_8"> | 251 | <para style="terp_default_8"> |
| 4783 | @@ -277,7 +266,7 @@ | |||
| 4784 | 277 | <font color="white"> </font> | 266 | <font color="white"> </font> |
| 4785 | 278 | </para> | 267 | </para> |
| 4786 | 279 | <section> | 268 | <section> |
| 4788 | 280 | <para style="terp_default_Bold_9">[[ getLines(o) and removeParentNode('section')]]There is nothing due with this customer.</para> | 269 | <para style="terp_default_Bold_9"><b>[[ getLines(o) and removeParentNode('section')]]There is nothing due with this customer.</b></para> |
| 4789 | 281 | </section> | 270 | </section> |
| 4790 | 282 | <para style="terp_default_9"> | 271 | <para style="terp_default_9"> |
| 4791 | 283 | <font color="white"> </font> | 272 | <font color="white"> </font> |
| 4792 | 284 | 273 | ||
| 4793 | === modified file 'account/report/account_tax_report.rml' | |||
| 4794 | --- account/report/account_tax_report.rml 2011-12-21 09:08:11 +0000 | |||
| 4795 | +++ account/report/account_tax_report.rml 2013-08-13 05:40:59 +0000 | |||
| 4796 | @@ -82,46 +82,25 @@ | |||
| 4797 | 82 | <initialize> | 82 | <initialize> |
| 4798 | 83 | <paraStyle name="all" alignment="justify"/> | 83 | <paraStyle name="all" alignment="justify"/> |
| 4799 | 84 | </initialize> | 84 | </initialize> |
| 4829 | 85 | <paraStyle name="P1" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/> | 85 | <paraStyle name="P2" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> |
| 4830 | 86 | <paraStyle name="P2" fontName="Helvetica-bold" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 86 | <paraStyle name="P5" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 4831 | 87 | <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> | 87 | <paraStyle name="P6" fontSize="8.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 4832 | 88 | <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | 88 | <paraStyle name="P7" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> |
| 4833 | 89 | <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | 89 | <paraStyle name="P12" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/> |
| 4834 | 90 | <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 90 | <paraStyle name="P12a" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4835 | 91 | <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 91 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4836 | 92 | <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | 92 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4808 | 93 | <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4809 | 94 | <paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4810 | 95 | <paraStyle name="P9c" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4811 | 96 | <paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4812 | 97 | <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/> | ||
| 4813 | 98 | <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14"/> | ||
| 4814 | 99 | <paraStyle name="P12" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/> | ||
| 4815 | 100 | <paraStyle name="P12a" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4816 | 101 | <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4817 | 102 | <paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4818 | 103 | <paraStyle name="P15" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4819 | 104 | <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4820 | 105 | <paraStyle name="Standard" fontName="Helvetica"/> | ||
| 4821 | 106 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4822 | 107 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4823 | 108 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4824 | 109 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 4825 | 110 | <paraStyle name="Caption" fontName="Helvetica" fontSize="1.0" leading="1" spaceBefore="0" spaceAfter="0"/> | ||
| 4826 | 111 | <paraStyle name="Index" fontName="Helvetica"/> | ||
| 4827 | 112 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 4828 | 113 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4837 | 114 | 93 | ||
| 4838 | 115 | </stylesheet> | 94 | </stylesheet> |
| 4839 | 116 | <story> | 95 | <story> |
| 4841 | 117 | <para style="P2">Tax Statement</para> | 96 | <para style="P2"><b>Tax Statement</b></para> |
| 4842 | 118 | <para style="P2"><font color="white"> </font></para> | 97 | <para style="P2"><font color="white"> </font></para> |
| 4843 | 119 | <blockTable colWidths="140.0,120.0,160.0,120.0" style="Table3"> | 98 | <blockTable colWidths="140.0,120.0,160.0,120.0" style="Table3"> |
| 4844 | 120 | <tr> | 99 | <tr> |
| 4849 | 121 | <td><para style="terp_tblheader_General_Centre">Chart of Tax</para></td> | 100 | <td><para style="terp_tblheader_General_Centre"><b>Chart of Tax</b></para></td> |
| 4850 | 122 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> | 101 | <td><para style="terp_tblheader_General_Centre"><b>Fiscal Year</b></para></td> |
| 4851 | 123 | <td><para style="terp_tblheader_General_Centre">Periods</para></td> | 102 | <td><para style="terp_tblheader_General_Centre"><b>Periods</b></para></td> |
| 4852 | 124 | <td><para style="terp_tblheader_General_Centre">Based On</para></td> | 103 | <td><para style="terp_tblheader_General_Centre"><b>Based On</b></para></td> |
| 4853 | 125 | </tr> | 104 | </tr> |
| 4854 | 126 | <tr> | 105 | <tr> |
| 4855 | 127 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> | 106 | <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> |
| 4856 | @@ -129,8 +108,8 @@ | |||
| 4857 | 129 | <td> | 108 | <td> |
| 4858 | 130 | <blockTable colWidths="80.0,80.0" style="Table4"> | 109 | <blockTable colWidths="80.0,80.0" style="Table4"> |
| 4859 | 131 | <tr> | 110 | <tr> |
| 4862 | 132 | <td><para style="terp_tblheader_General_Centre">Start Period</para></td> | 111 | <td><para style="terp_tblheader_General_Centre"><b>Start Period</b></para></td> |
| 4863 | 133 | <td><para style="terp_tblheader_General_Centre">End Period</para></td> | 112 | <td><para style="terp_tblheader_General_Centre"><b>End Period</b></para></td> |
| 4864 | 134 | </tr> | 113 | </tr> |
| 4865 | 135 | <tr> | 114 | <tr> |
| 4866 | 136 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or '' ]]</para></td> | 115 | <td><para style="terp_default_Centre_8">[[ get_start_period(data) or '' ]]</para></td> |
| 4867 | @@ -144,16 +123,17 @@ | |||
| 4868 | 144 | <para style="P2"><font color="white"> </font></para> | 123 | <para style="P2"><font color="white"> </font></para> |
| 4869 | 145 | <blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1"> | 124 | <blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1"> |
| 4870 | 146 | <tr> | 125 | <tr> |
| 4875 | 147 | <td><para style="P12">Tax Name</para></td> | 126 | <td><para style="P12"><b>Tax Name</b></para></td> |
| 4876 | 148 | <td><para style="P12a">Debit</para></td> | 127 | <td><para style="P12a"><b>Debit</b></para></td> |
| 4877 | 149 | <td><para style="P12a">Credit</para></td> | 128 | <td><para style="P12a"><b>Credit</b></para></td> |
| 4878 | 150 | <td><para style="P12a">Tax Amount</para></td> | 129 | <td><para style="P12a"><b>Tax Amount</b></para></td> |
| 4879 | 151 | </tr> | 130 | </tr> |
| 4880 | 152 | <tr> | 131 | <tr> |
| 4885 | 153 | <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'], data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[ (len(o['level'])<5 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ o['code'] ]] [[ o['name'] ]] </font></para></td> | 132 | <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'], data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font><font>[[ len(o['level'])<5 and removeParentNode('font') ]][[ o['code'] ]] [[ o['name'] ]] </font><b>[[ len(o['level'])> 5 and removeParentNode('b') ]] [[ o['code'] ]] [[ o['name'] ]] </b> |
| 4886 | 154 | <td><para style="P6"><font>[[ len(o['level'])<5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font></para></td> | 133 | </para></td> |
| 4887 | 155 | <td><para style="P6"><font>[[ len(o['level'])<5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font></para></td> | 134 | <td><para style="P6"> <font>[[ len(o['level'])<5 and removeParentNode('font')]][[ formatLang(o['debit']) ]]</font><b>[[ len(o['level'])>5 and removeParentNode('b')]][[ formatLang(o['debit']) ]]</b></para></td> |
| 4888 | 156 | <td><para style="P6"><font>[[ len(o['level'])<5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount'], currency_obj=company.currency_id) ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount'], currency_obj=company.currency_id) ]]</font> </para></td> | 135 | <td><para style="P6"><font>[[ len(o['level'])<5 and removeParentNode('font')]][[ formatLang(o['credit']) ]]</font><b>[[ len(o['level'])>5 and removeParentNode('b')]][[ formatLang(o['credit']) ]]</b></para></td> |
| 4889 | 136 | <td><para style="P6"><font>[[ len(o['level'])<5 and removeParentNode('font')]][[ formatLang(o['tax_amount'], currency_obj=company.currency_id) ]]</font><b>[[ len(o['level'])>5 and removeParentNode('b')]][[ formatLang(o['tax_amount'], currency_obj=company.currency_id) ]]</b></para></td> | ||
| 4890 | 157 | </tr> | 137 | </tr> |
| 4891 | 158 | </blockTable> | 138 | </blockTable> |
| 4892 | 159 | </story> | 139 | </story> |
| 4893 | 160 | 140 | ||
| 4894 | === modified file 'account_analytic_plans/report/crossovered_analytic.rml' | |||
| 4895 | --- account_analytic_plans/report/crossovered_analytic.rml 2012-06-13 09:06:00 +0000 | |||
| 4896 | +++ account_analytic_plans/report/crossovered_analytic.rml 2013-08-13 05:40:59 +0000 | |||
| 4897 | @@ -99,37 +99,26 @@ | |||
| 4898 | 99 | <initialize> | 99 | <initialize> |
| 4899 | 100 | <paraStyle name="all" alignment="justify"/> | 100 | <paraStyle name="all" alignment="justify"/> |
| 4900 | 101 | </initialize> | 101 | </initialize> |
| 4932 | 102 | <paraStyle name="Standard" fontName="Helvetica"/> | 102 | <paraStyle name="terp_header" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4933 | 103 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 103 | <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4934 | 104 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 104 | <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4935 | 105 | <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 105 | <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4936 | 106 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> | 106 | <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4937 | 107 | <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> | 107 | <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4938 | 108 | <paraStyle name="Index" fontName="Helvetica"/> | 108 | <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> |
| 4939 | 109 | <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> | 109 | <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4940 | 110 | <paraStyle name="Footer" fontName="Helvetica"/> | 110 | <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4941 | 111 | <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> | 111 | <paraStyle name="terp_default_Right_8" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4942 | 112 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 112 | <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4943 | 113 | <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> | 113 | <paraStyle name="terp_header_Right" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4944 | 114 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | 114 | <paraStyle name="terp_header_Centre" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4945 | 115 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 115 | <paraStyle name="terp_default_address" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4946 | 116 | <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 116 | <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4947 | 117 | <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 117 | <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4948 | 118 | <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 118 | <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4949 | 119 | <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> | 119 | <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4950 | 120 | <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 120 | <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
| 4951 | 121 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 121 | <paraStyle name="terp_default_space_0.5" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/> |
| 4921 | 122 | <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4922 | 123 | <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4923 | 124 | <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4924 | 125 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4925 | 126 | <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4926 | 127 | <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4927 | 128 | <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4928 | 129 | <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4929 | 130 | <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4930 | 131 | <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 4931 | 132 | <paraStyle name="terp_default_space_0.5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/> | ||
| 4952 | 133 | <images/> | 122 | <images/> |
| 4953 | 134 | </stylesheet> | 123 | </stylesheet> |
| 4954 | 135 | <story> | 124 | <story> |
| 4955 | @@ -138,19 +127,19 @@ | |||
| 4956 | 138 | <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" repeatRows="1" style="Table3"> | 127 | <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" repeatRows="1" style="Table3"> |
| 4957 | 139 | <tr> | 128 | <tr> |
| 4958 | 140 | <td> | 129 | <td> |
| 4972 | 141 | <para style="terp_tblheader_Details">Account Name</para> | 130 | <para style="terp_tblheader_Details"><b>Account Name</b></para> |
| 4973 | 142 | </td> | 131 | </td> |
| 4974 | 143 | <td> | 132 | <td> |
| 4975 | 144 | <para style="terp_tblheader_Details_Centre">Code</para> | 133 | <para style="terp_tblheader_Details_Centre"><b>Code</b></para> |
| 4976 | 145 | </td> | 134 | </td> |
| 4977 | 146 | <td> | 135 | <td> |
| 4978 | 147 | <para style="terp_tblheader_Details_Right">Quantity</para> | 136 | <para style="terp_tblheader_Details_Right"><b>Quantity</b></para> |
| 4979 | 148 | </td> | 137 | </td> |
| 4980 | 149 | <td> | 138 | <td> |
| 4981 | 150 | <para style="terp_tblheader_Details_Right">Amount</para> | 139 | <para style="terp_tblheader_Details_Right"><b>Amount</b></para> |
| 4982 | 151 | </td> | 140 | </td> |
| 4983 | 152 | <td> | 141 | <td> |
| 4984 | 153 | <para style="terp_tblheader_Details_Right">Perc(%)</para> | 142 | <para style="terp_tblheader_Details_Right"><b>Perc(%)</b></para> |
| 4985 | 154 | </td> | 143 | </td> |
| 4986 | 155 | </tr> | 144 | </tr> |
| 4987 | 156 | </blockTable> | 145 | </blockTable> |
| 4988 | @@ -158,26 +147,26 @@ | |||
| 4989 | 158 | <para style="terp_default_8"> | 147 | <para style="terp_default_8"> |
| 4990 | 159 | <font color="white"> </font> | 148 | <font color="white"> </font> |
| 4991 | 160 | </para> | 149 | </para> |
| 4993 | 161 | <para style="terp_header_Centre">Crossovered Analytic</para> | 150 | <para style="terp_header_Centre"><b>Crossovered Analytic</b></para> |
| 4994 | 162 | <para style="terp_default_8"> | 151 | <para style="terp_default_8"> |
| 4995 | 163 | <font color="white"> </font> | 152 | <font color="white"> </font> |
| 4996 | 164 | </para> | 153 | </para> |
| 4997 | 165 | <blockTable colWidths="108.0,108.0,108.0,108.0,108.0" style="Table1"> | 154 | <blockTable colWidths="108.0,108.0,108.0,108.0,108.0" style="Table1"> |
| 4998 | 166 | <tr> | 155 | <tr> |
| 4999 | 167 | <td> | 156 | <td> |
| 5000 | 168 | <para style="terp_tblheader_General_Centre">From Date</para> | ||
The diff has been truncated for viewing.
Hello chirag,
Still i can see fontname in some report, remove it
Remove unused parastyle from the report.
Thanks