details: /erp/devel/pi/rev/f9cd91d56af7
changeset: 8554:f9cd91d56af7
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Mon Oct 18 07:25:26 2010 +0200
summary: Fixed bug 14196: Balance sheet and P&L structure translation
There were words impossible to translate due to blank spaces in FO.
Removed the blank spaces and used some labels that are already
translated in other parts of the ERP, so they are automatically
translated once the patch is applied.
diffstat:
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 77
+--------
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo | 19 +-
2 files changed, 22 insertions(+), 74 deletions(-)
diffs (177 lines):
diff -r 3ee69e7732d7 -r f9cd91d56af7
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Sat Oct 16 01:23:53
2010 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Oct 18 07:25:26
2010 +0200
@@ -3635,17 +3635,6 @@
<!--803734--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--803734--></AD_TEXTINTERFACES>
-<!--803740--><AD_TEXTINTERFACES>
-<!--803740--> <AD_TEXTINTERFACES_ID><![CDATA[803740]]></AD_TEXTINTERFACES_ID>
-<!--803740--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--803740--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--803740--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803740--> <TEXT><![CDATA[Enterprise N-1: ]]></TEXT>
-<!--803740-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
-<!--803740--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--803740--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--803740--></AD_TEXTINTERFACES>
-
<!--803742--><AD_TEXTINTERFACES>
<!--803742--> <AD_TEXTINTERFACES_ID><![CDATA[803742]]></AD_TEXTINTERFACES_ID>
<!--803742--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16623,6 +16612,17 @@
<!--48AF9E125D2143669AFAAA89D52473D3-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--48AF9E125D2143669AFAAA89D52473D3--></AD_TEXTINTERFACES>
+<!--49CC005EEE51425CBEC072A4BFFFC929--><AD_TEXTINTERFACES>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->
<AD_TEXTINTERFACES_ID><![CDATA[49CC005EEE51425CBEC072A4BFFFC929]]></AD_TEXTINTERFACES_ID>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--49CC005EEE51425CBEC072A4BFFFC929--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--49CC005EEE51425CBEC072A4BFFFC929--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--49CC005EEE51425CBEC072A4BFFFC929--> <TEXT><![CDATA[ N-1: ]]></TEXT>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
+<!--49CC005EEE51425CBEC072A4BFFFC929--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--49CC005EEE51425CBEC072A4BFFFC929--></AD_TEXTINTERFACES>
+
<!--4B1D50A666314B7494E607B737A9D2D0--><AD_TEXTINTERFACES>
<!--4B1D50A666314B7494E607B737A9D2D0-->
<AD_TEXTINTERFACES_ID><![CDATA[4B1D50A666314B7494E607B737A9D2D0]]></AD_TEXTINTERFACES_ID>
<!--4B1D50A666314B7494E607B737A9D2D0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16678,17 +16678,6 @@
<!--4CF72E501DE011DEBEBB001EEC1F37D2-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--4CF72E501DE011DEBEBB001EEC1F37D2--></AD_TEXTINTERFACES>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738--><AD_TEXTINTERFACES>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738-->
<AD_TEXTINTERFACES_ID><![CDATA[4D2F70BC4B25449CBD7E2D96F4BCC738]]></AD_TEXTINTERFACES_ID>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738--> <TEXT><![CDATA[Period N-1:]]></TEXT>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4D2F70BC4B25449CBD7E2D96F4BCC738--></AD_TEXTINTERFACES>
-
<!--4D3B5BA6D00711DDA04A001D09C4A2FE--><AD_TEXTINTERFACES>
<!--4D3B5BA6D00711DDA04A001D09C4A2FE-->
<AD_TEXTINTERFACES_ID><![CDATA[4D3B5BA6D00711DDA04A001D09C4A2FE]]></AD_TEXTINTERFACES_ID>
<!--4D3B5BA6D00711DDA04A001D09C4A2FE-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21417,28 +21406,6 @@
<!--A6D474BA1F7E40D1BB40DB73A393B864-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--A6D474BA1F7E40D1BB40DB73A393B864--></AD_TEXTINTERFACES>
-<!--A7AA90FC864240438547A5F651A2123E--><AD_TEXTINTERFACES>
-<!--A7AA90FC864240438547A5F651A2123E-->
<AD_TEXTINTERFACES_ID><![CDATA[A7AA90FC864240438547A5F651A2123E]]></AD_TEXTINTERFACES_ID>
-<!--A7AA90FC864240438547A5F651A2123E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A7AA90FC864240438547A5F651A2123E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A7AA90FC864240438547A5F651A2123E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A7AA90FC864240438547A5F651A2123E--> <TEXT><![CDATA[Enterprise:]]></TEXT>
-<!--A7AA90FC864240438547A5F651A2123E-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
-<!--A7AA90FC864240438547A5F651A2123E--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--A7AA90FC864240438547A5F651A2123E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A7AA90FC864240438547A5F651A2123E--></AD_TEXTINTERFACES>
-
-<!--A8509B51C20A4BE5BCF112ED50FF949D--><AD_TEXTINTERFACES>
-<!--A8509B51C20A4BE5BCF112ED50FF949D-->
<AD_TEXTINTERFACES_ID><![CDATA[A8509B51C20A4BE5BCF112ED50FF949D]]></AD_TEXTINTERFACES_ID>
-<!--A8509B51C20A4BE5BCF112ED50FF949D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A8509B51C20A4BE5BCF112ED50FF949D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A8509B51C20A4BE5BCF112ED50FF949D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A8509B51C20A4BE5BCF112ED50FF949D--> <TEXT><![CDATA[Period:]]></TEXT>
-<!--A8509B51C20A4BE5BCF112ED50FF949D-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
-<!--A8509B51C20A4BE5BCF112ED50FF949D--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--A8509B51C20A4BE5BCF112ED50FF949D-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A8509B51C20A4BE5BCF112ED50FF949D--></AD_TEXTINTERFACES>
-
<!--A9431A0BF54D40E380277F533EA41425--><AD_TEXTINTERFACES>
<!--A9431A0BF54D40E380277F533EA41425-->
<AD_TEXTINTERFACES_ID><![CDATA[A9431A0BF54D40E380277F533EA41425]]></AD_TEXTINTERFACES_ID>
<!--A9431A0BF54D40E380277F533EA41425-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21593,17 +21560,6 @@
<!--BBF8472FF8784BFEBE792346154E0455-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--BBF8472FF8784BFEBE792346154E0455--></AD_TEXTINTERFACES>
-<!--BC8C1D3E6DBB42A1B363669B64A17815--><AD_TEXTINTERFACES>
-<!--BC8C1D3E6DBB42A1B363669B64A17815-->
<AD_TEXTINTERFACES_ID><![CDATA[BC8C1D3E6DBB42A1B363669B64A17815]]></AD_TEXTINTERFACES_ID>
-<!--BC8C1D3E6DBB42A1B363669B64A17815-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--BC8C1D3E6DBB42A1B363669B64A17815--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--BC8C1D3E6DBB42A1B363669B64A17815--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--BC8C1D3E6DBB42A1B363669B64A17815--> <TEXT><![CDATA[Date:]]></TEXT>
-<!--BC8C1D3E6DBB42A1B363669B64A17815-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
-<!--BC8C1D3E6DBB42A1B363669B64A17815--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--BC8C1D3E6DBB42A1B363669B64A17815-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--BC8C1D3E6DBB42A1B363669B64A17815--></AD_TEXTINTERFACES>
-
<!--C25EA66C5D9841209AE6AB7F11AE2F27--><AD_TEXTINTERFACES>
<!--C25EA66C5D9841209AE6AB7F11AE2F27-->
<AD_TEXTINTERFACES_ID><![CDATA[C25EA66C5D9841209AE6AB7F11AE2F27]]></AD_TEXTINTERFACES_ID>
<!--C25EA66C5D9841209AE6AB7F11AE2F27-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21791,17 +21747,6 @@
<!--DD99CE7A10704467BA47244582B45F7D-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--DD99CE7A10704467BA47244582B45F7D--></AD_TEXTINTERFACES>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85--><AD_TEXTINTERFACES>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85-->
<AD_TEXTINTERFACES_ID><![CDATA[E03E4F8EB8374ED9AE0A029FDFF82D85]]></AD_TEXTINTERFACES_ID>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85--> <TEXT><![CDATA[Organization:]]></TEXT>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--E03E4F8EB8374ED9AE0A029FDFF82D85--></AD_TEXTINTERFACES>
-
<!--E061FC68EEE84521AAC366955C17ED7A--><AD_TEXTINTERFACES>
<!--E061FC68EEE84521AAC366955C17ED7A-->
<AD_TEXTINTERFACES_ID><![CDATA[E061FC68EEE84521AAC366955C17ED7A]]></AD_TEXTINTERFACES_ID>
<!--E061FC68EEE84521AAC366955C17ED7A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 3ee69e7732d7 -r f9cd91d56af7
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
Sat Oct 16 01:23:53 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
Mon Oct 18 07:25:26 2010 +0200
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2006 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -38,15 +38,15 @@
<fo:table-row>
<fo:table-cell>
<fo:block
font-size="10pt" text-align="left" padding-top="2pt">
- <fo:inline
font-weight="bold">Enterprise:</fo:inline>
+ <fo:inline
font-weight="bold">Client</fo:inline>:  
<fo:inline
id="fieldCompanyName">xx</fo:inline>  <fo:inline
id="fieldAgnoInitial"/>
- <fo:inline
font-weight="bold">Organization:</fo:inline>
+ <fo:inline
font-weight="bold">Organization</fo:inline>:  
<fo:inline
id="fieldOrg">xx</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block
font-size="10pt" text-align="left" padding-top="2pt">
- <fo:inline
font-weight="bold">Date:</fo:inline>
+ <fo:inline
font-weight="bold">Date</fo:inline>:  
<fo:inline
id="fieldDate">xx</fo:inline>
</fo:block>
</fo:table-cell>
@@ -54,16 +54,19 @@
<fo:table-row>
<fo:table-cell
number-columns-spanned="2">
<fo:block
font-size="10pt" text-align="left" padding-top="2pt">
- <fo:inline
font-weight="bold">Conditions:</fo:inline>
-
<fo:inline>Period:</fo:inline>
- <fo:inline
id="fieldPeriod">xx</fo:inline>    <fo:inline>Period
N-1:</fo:inline>
+ <fo:inline
font-weight="bold">Conditions:</fo:inline>  
+
<fo:inline>Period</fo:inline>:  
+ <fo:inline
id="fieldPeriod">xx</fo:inline>    <fo:inline>Period</fo:inline> N-1:  
<fo:inline
id="fieldPeriodRef">xx</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell
number-columns-spanned="2" border-bottom-style="solid"
border-bottom-width="0.5pt">
- <fo:block
font-size="10pt" padding-bottom="4pt" text-align="left" padding-top="2pt"
start-indent="2.4cm">Enterprise N-1:  <fo:inline
id="fieldCompanyName">Period</fo:inline>  <fo:inline
id="fieldAgnoRef">xx</fo:inline>
+ <fo:block
font-size="10pt" padding-bottom="4pt" text-align="left" padding-top="2pt"
start-indent="2.4cm">
+
<fo:inline>Client</fo:inline> N-1:  
+ <fo:inline
id="fieldCompanyName">Period</fo:inline>  
+ <fo:inline id="fieldAgnoRef">xx</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
