OpenConcerto

Dépôt officiel du code source de l'ERP OpenConcerto
sonarqube

svn://code.openconcerto.org/openconcerto

Compare Revisions

Regard whitespace Rev 110 → Rev 140

/trunk/Modules/Module OLAP/src/org/openconcerto/modules/reports/olap/openconcerto_catalog.xml~
File deleted
/trunk/Modules/Module OLAP/src/org/openconcerto/modules/reports/olap/openconcerto_catalog.xml
3,7 → 3,6
 
<Cube name="Ventes">
<Table name="SAISIE_VENTE_FACTURE_ELEMENT" schema="_SCHEMA_"/>
<Dimension name="Articles" foreignKey="ID_ARTICLE">
<Hierarchy hasAll="true" allMemberName="Tous les articles" primaryKey="ID">
<View alias="ARTICLE">
10,7 → 9,7
<SQL dialect="generic"> <![CDATA[select * from "_SCHEMA_"."ARTICLE" where "ARCHIVE" = '0']]>
</SQL>
</View>
<Level name="Désignation" column="NOM" uniqueMembers="true" />
<Level name="Designation" column="NOM" uniqueMembers="true" />
<Level name="Code produit" column="CODE" uniqueMembers="true" />
</Hierarchy>
</Dimension>
31,7 → 30,7
<SQL dialect="generic"> <![CDATA[select * from "_SCHEMA_"."SAISIE_VENTE_FACTURE" where "ARCHIVE" = '0']]>
</SQL>
</View>
<Level name="Année" column="DATE" uniqueMembers="true" levelType="TimeYears" type="Numeric">
<Level name="Annee" column="DATE" uniqueMembers="true" levelType="TimeYears" type="Numeric">
<KeyExpression>
<SQL dialect="generic">
<![CDATA[EXTRACT(YEAR FROM "SAISIE_VENTE_FACTURE"."DATE")]]>
49,18 → 48,18
</Level>
</Hierarchy>
</Dimension>
<Dimension name="Ligne facturées">
<Dimension name="Ligne facturees">
<Hierarchy hasAll="true" primaryKey="ID">
<Table name="SAISIE_VENTE_FACTURE_ELEMENT" schema="_SCHEMA_"/>
<Level name="Quantité" column="QTE" type="Numeric" uniqueMembers="false"/>
<Level name="Quantite" column="QTE" type="Numeric" uniqueMembers="false"/>
<Level name="Code article" column="CODE" type="String" uniqueMembers="false"/>
<Level name="Poids" column="POIDS" type="Numeric" uniqueMembers="false"/>
<Level name="Désignation" column="NOM" type="String" uniqueMembers="false"/>
<Level name="Designation" column="NOM" type="String" uniqueMembers="false"/>
</Hierarchy>
</Dimension>
<Measure name="Nombre vendu" column="ID_ARTICLE" aggregator="count" formatString="Standard" />
<Measure name="Quantité" column="QTE" aggregator="count" formatString="Standard" />
<Measure name="Quantite" column="QTE" aggregator="count" formatString="Standard" />
<Measure name="Prix de vente HT" column="T_PV_HT" aggregator="sum"
formatter="org.openconcerto.modules.reports.olap.formatter.CentsCellFormatter" />
<Measure name="Prix d'achat HT" column="T_PA_HT" aggregator="sum"
/trunk/Modules/Module OLAP/src/org/openconcerto/modules/reports/olap/OLAPPanel.java
32,7 → 32,7
this.removeAll();
this.invalidate();
try {
final File dir = new File(ComptaPropsConfiguration.getConfFile().getParent());
final File dir = new File(ComptaPropsConfiguration.getConfFile(ComptaPropsConfiguration.productInfo).getParent());
final File f = new File(dir, "openconcerto_catalog.xml");
String catalog = "empty";
if (f.exists()) {