Author: bpoussin Date: 2012-09-13 12:16:43 +0200 (Thu, 13 Sep 2012) New Revision: 265 Url: http://chorem.org/repositories/revision/chorem/265 Log: - reprise du dashboard summary pour prendre en compte les changements sur invoices (supplier/customer) Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-09-13 10:09:57 UTC (rev 264) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-09-13 10:16:43 UTC (rev 265) @@ -158,7 +158,7 @@ .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, firstDayYear, now) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end().setLimit(WikittyQuery.MAX); // toutes les factures emises depuis le debut de l'annee @@ -168,7 +168,7 @@ .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, firstDayYear, now) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end(); // toutes les depenses depuis le debut de l'annee @@ -178,7 +178,7 @@ .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, lastYearFirstDay, lastYearNow) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end().setLimit(WikittyQuery.MAX); // toutes les factures emises depuis le debut de l'annee @@ -188,7 +188,7 @@ .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, lastYearFirstDay, lastYearNow) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end(); @@ -200,7 +200,7 @@ .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, inOneWeek) .isNull(Invoice.FQ_FIELD_INVOICE_PAYMENTDATE) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end().setLimit(WikittyQuery.MAX); // les factures qu'auraient du payer nos clients (ils sont en retard) @@ -211,7 +211,7 @@ .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, now) .isNull(Invoice.FQ_FIELD_INVOICE_PAYMENTDATE) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end(); // les contacts qui doivnet etre pris dans les 7 prochains jours