WebSVN - OpenConcerto - Diff - Rev 177 and 180 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/report/Map2033B.java



        /*******************************************************************************************
         * ACHATS DE MARCHANDISES
         ******************************************************************************************/
        // 234 SommeSolde( 607, 608* )+SommeSolde( 6097, 6097* )
        long v234 = this.sommeCompte.soldeCompte(607, 607, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(6097, 6097, true, this.dateDeb, this.dateFin)
                + this.sommeCompte.soldeCompte(608, 608, true, this.dateDeb, this.dateFin) - this.sommeCompte.soldeCompte(6081, 6086, true, this.dateDeb, this.dateFin);
 
        this.m.put("CHARGES3.8", GestionDevise.currencyToString(v234, false));
 
        // 208
        this.m.put("CHARGES4.8", "");
 

         ******************************************************************************************/
        // 238 SommeSolde( 600, 602* )+SommeSolde( 6090, 6092* )
        // S238=601+602+6091+6092
        // FIX Abaque ajout 609
        long v238 = this.sommeCompte.soldeCompte(601, 602, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(609, 609, true, this.dateDeb, this.dateFin)
                - this.sommeCompte.soldeCompte(6093, 6099, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(6081, 6083, true, this.dateDeb, this.dateFin);
        this.m.put("CHARGES3.10", GestionDevise.currencyToString(v238, false));
 
        // 212
        this.m.put("CHARGES4.10", "");
 

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/report/Map2033B.java - Rev 177 → 180

Rev 177		Rev 180
Line 181...		Line 181...
181	`/*******************************************************************************************`	181	`/*******************************************************************************************`
182	`* ACHATS DE MARCHANDISES`	182	`* ACHATS DE MARCHANDISES`
183	`******************************************************************************************/`	183	`******************************************************************************************/`
184	`// 234 SommeSolde( 607, 608* )+SommeSolde( 6097, 6097* )`	184	`// 234 SommeSolde( 607, 608* )+SommeSolde( 6097, 6097* )`
185	`long v234 = this.sommeCompte.soldeCompte(607, 607, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(6097, 6097, true, this.dateDeb, this.dateFin)`	185	`long v234 = this.sommeCompte.soldeCompte(607, 607, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(6097, 6097, true, this.dateDeb, this.dateFin)`
186	`+ this.sommeCompte.soldeCompte(6087, 6087, true, this.dateDeb, this.dateFin);`	186	`+ this.sommeCompte.soldeCompte(608, 608, true, this.dateDeb, this.dateFin) - this.sommeCompte.soldeCompte(6081, 6086, true, this.dateDeb, this.dateFin);`
-		187
187	`this.m.put("CHARGES3.8", GestionDevise.currencyToString(v234, false));`	188	`this.m.put("CHARGES3.8", GestionDevise.currencyToString(v234, false));`
188		189
189	`// 208`	190	`// 208`
190	`this.m.put("CHARGES4.8", "");`	191	`this.m.put("CHARGES4.8", "");`
191		192
Line 204...		Line 205...
204	`******************************************************************************************/`	205	`******************************************************************************************/`
205	`// 238 SommeSolde( 600, 602* )+SommeSolde( 6090, 6092* )`	206	`// 238 SommeSolde( 600, 602* )+SommeSolde( 6090, 6092* )`
206	`// S238=601+602+6091+6092`	207	`// S238=601+602+6091+6092`
207	`// FIX Abaque ajout 609`	208	`// FIX Abaque ajout 609`
208	`long v238 = this.sommeCompte.soldeCompte(601, 602, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(609, 609, true, this.dateDeb, this.dateFin)`	209	`long v238 = this.sommeCompte.soldeCompte(601, 602, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(609, 609, true, this.dateDeb, this.dateFin)`
209	`- this.sommeCompte.soldeCompte(6093, 6099, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(6081, 6082, true, this.dateDeb, this.dateFin);`	210	`- this.sommeCompte.soldeCompte(6093, 6099, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(6081, 6083, true, this.dateDeb, this.dateFin);`
210	`this.m.put("CHARGES3.10", GestionDevise.currencyToString(v238, false));`	211	`this.m.put("CHARGES3.10", GestionDevise.currencyToString(v238, false));`
211		212
212	`// 212`	213	`// 212`
213	`this.m.put("CHARGES4.10", "");`	214	`this.m.put("CHARGES4.10", "");`
214		215