Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk @ 164

  → /trunk/ @ 165

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 164 → Rev 165

/trunk/Modules/Module Customer Support/src/org/openconcerto/modules/customersupport/SQLElementNames_fr.xml
File deleted

/trunk/Modules/Module Customer Support/src/org/openconcerto/modules/customersupport/SQLElementNames_en.xml
File deleted

/trunk/Modules/Module Customer Support/src/org/openconcerto/modules/customersupport/CustomerSupportTicketSQLElement.java
12,6 → 12,7
import org.openconcerto.erp.core.common.ui.IListFilterDatePanel;
import org.openconcerto.erp.core.common.ui.PanelFrame;
import org.openconcerto.erp.model.MouseSheetXmlListeListener;
import org.openconcerto.erp.modules.AbstractModule;
import org.openconcerto.erp.modules.ModuleElement;
import org.openconcerto.sql.element.GlobalMapper;
34,7 → 35,6
public CustomerSupportTicketSQLElement(final AbstractModule module) {
super(module, Module.TABLE_CUSTOMER_SUPPORT_TICKET);
this.setL18nLocation(CustomerSupportTicketSQLElement.class);
// Suivi
final RowAction.PredicateRowAction addSuiviAction = new RowAction.PredicateRowAction(new AbstractAction("Suivi du ticket") {
92,6 → 92,9
addHistoriqueAction.setPredicate(IListeEvent.createSelectionCountPredicate(0, Integer.MAX_VALUE));
getRowActions().add(addHistoriqueAction);
MouseSheetXmlListeListener l = new MouseSheetXmlListeListener(CustomerSupportTicketSheetXML.class);
getRowActions().addAll(l.getRowActions());
}
@Override

/trunk/Modules/Module Customer Support/src/org/openconcerto/modules/customersupport/labels_fr.xml
1,6 → 1,6
<?xml version="1.0" encoding="UTF-8" ?>
<ROOT>
<TABLE name="CUSTOMER_SUPPORT_TICKET">
<element refid="customersupport.ticket" nameClass="masculine" name="ticket de support">
<FIELD name="STATUS" label="Status" />
<FIELD name="LABEL" label="Libellé" />
<FIELD name="ID_CLIENT" label="Client" />
12,11 → 12,11
<FIELD name="REMIND_DATE" label="Prochain rappel le" />
<FIELD name="DATE" label="Date" />
<FIELD name="CLOSED_AND_ARCHIVED" label="Archivé" />
</TABLE>
<TABLE name="CUSTOMER_SUPPORT_TICKET_HISTORY">
</element>
<element refid="customersupport.ticket.history" nameClass="feminine" name="Intervention sur ticket">
<FIELD name="ID_CUSTOMER_SUPPORT_TICKET" label="Ticket" />
<FIELD name="ID_USER_COMMON" label="Utilisateur en charge" />
<FIELD name="INFORMATION" label="Détails de l'intervention" />
<FIELD name="DATE" label="Date" />
</TABLE>
</element>
</ROOT>

/trunk/Modules/Module Customer Support/src/org/openconcerto/modules/customersupport/CustomerSupportTicketSheetXML.java
New file
0,0 → 1,48
/*
* Créé le 18 oct. 2011
*/
package org.openconcerto.modules.customersupport;
import org.openconcerto.erp.generationDoc.AbstractSheetXMLWithDate;
import org.openconcerto.erp.preferences.PrinterNXProps;
import org.openconcerto.sql.Configuration;
import org.openconcerto.sql.model.SQLRow;
public class CustomerSupportTicketSheetXML extends AbstractSheetXMLWithDate {
public static String TEMPLATE_ID = "CustomerSupportTicket";
public static String TEMPLATE_PROPERTY_NAME = "LocationCmd";
// private static final Tuple2<String, String> tuple = Tuple2.create("LocationDmd",
// "Demande de prix");
//
// public static Tuple2<String, String> getTuple2Location() {
// return tuple;
// }
@Override
public String getReference() {
return this.row.getString("NUMERO");
}
// FIXME Prefs printer location
public CustomerSupportTicketSheetXML(SQLRow row) {
super(row);
this.printer = PrinterNXProps.getInstance().getStringProperty("CmdPrinter");
this.elt = Configuration.getInstance().getDirectory().getElement(Module.TABLE_CUSTOMER_SUPPORT_TICKET);
}
@Override
public String getTemplateId() {
return "TicketSupport";
}
public String getName() {
return "TicketSupport_" + this.row.getString("NUMBER");
}
@Override
public String getDefaultTemplateId() {
return "TicketSupport";
}
}

/trunk/Modules/Module Customer Support/src/org/openconcerto/modules/customersupport/CustomerTicketHistorySQLElement.java
26,7 → 26,6
public CustomerTicketHistorySQLElement(AbstractModule module) {
super(module, Module.TABLE_CUSTOMER_SUPPORT_TICKET_HISTORY);
this.setL18nLocation(CustomerTicketHistorySQLElement.class);
PredicateRowAction actionAttachment = new PredicateRowAction(new AttachmentAction().getAction(), true);
actionAttachment.setPredicate(IListeEvent.getSingleSelectionPredicate());
getRowActions().add(actionAttachment);

/trunk/Modules/Module Customer Support/src/org/openconcerto/modules/customersupport/Module.java
170,19 → 170,4
// nothing to stop
}
public static void main(String[] args) throws IOException {
System.setProperty(ConnexionPanel.QUICK_LOGIN, "true");
final File propsFile = new File("module.properties");
System.out.println(propsFile.getAbsolutePath());
final ModuleFactory factory = new RuntimeModuleFactory(propsFile);
SQLRequestLog.setEnabled(true);
SQLRequestLog.showFrame();
// uncomment to create and use the jar
final ModulePackager modulePackager = new ModulePackager(propsFile, new File("bin/"));
modulePackager.writeToDir(new File("../OpenConcerto/Modules"));
ModuleManager.getInstance().addFactories(new File("../OpenConcerto/Modules"));
ModuleManager.getInstance().addFactoryAndStart(factory, false);
Gestion.main(args);
}
}