Line 51... |
Line 51... |
51 |
import org.openconcerto.sql.Configuration;
|
51 |
import org.openconcerto.sql.Configuration;
|
52 |
import org.openconcerto.sql.model.SQLRow;
|
52 |
import org.openconcerto.sql.model.SQLRow;
|
53 |
import org.openconcerto.task.config.ComptaBasePropsConfiguration;
|
53 |
import org.openconcerto.task.config.ComptaBasePropsConfiguration;
|
54 |
import org.openconcerto.ui.preferences.TemplateProps;
|
54 |
import org.openconcerto.ui.preferences.TemplateProps;
|
55 |
import org.openconcerto.utils.StreamUtils;
|
55 |
import org.openconcerto.utils.StreamUtils;
|
- |
|
56 |
import org.openconcerto.utils.prog.VMLauncher;
|
56 |
|
57 |
|
57 |
import java.io.File;
|
58 |
import java.io.File;
|
58 |
import java.io.IOException;
|
59 |
import java.io.IOException;
|
59 |
import java.io.InputStream;
|
60 |
import java.io.InputStream;
|
60 |
|
61 |
|
Line 132... |
Line 133... |
132 |
storage.setPDFDefaultDirectory(new File(propertyDefaultPDFDirectory));
|
133 |
storage.setPDFDefaultDirectory(new File(propertyDefaultPDFDirectory));
|
133 |
|
134 |
|
134 |
register(DemandePrixSheetXML.TEMPLATE_ID, DemandePrixSheetXML.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("DEMANDE_PRIX"));
|
135 |
register(DemandePrixSheetXML.TEMPLATE_ID, DemandePrixSheetXML.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("DEMANDE_PRIX"));
|
135 |
register(DevisXmlSheet.TEMPLATE_ID, DevisXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("DEVIS"));
|
136 |
register(DevisXmlSheet.TEMPLATE_ID, DevisXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("DEVIS"));
|
136 |
register(VenteFactureXmlSheet.TEMPLATE_ID, VenteFactureXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("SAISIE_VENTE_FACTURE"));
|
137 |
register(VenteFactureXmlSheet.TEMPLATE_ID, VenteFactureXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("SAISIE_VENTE_FACTURE"));
|
- |
|
138 |
register(VenteFactureXmlSheet.TEMPLATE_ID + VenteFactureXmlSheet.TEMPLATE_SITUATION_SUFFIX, VenteFactureXmlSheet.TEMPLATE_PROPERTY_NAME,
|
- |
|
139 |
AbstractGenerationDocumentPreferencePanel.getLabelFromTable("SAISIE_VENTE_FACTURE") + " " + VenteFactureXmlSheet.TEMPLATE_SITUATION_SUFFIX);
|
137 |
register(CommandeClientXmlSheet.TEMPLATE_ID, CommandeClientXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("COMMANDE_CLIENT"));
|
140 |
register(CommandeClientXmlSheet.TEMPLATE_ID, CommandeClientXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("COMMANDE_CLIENT"));
|
138 |
register(BonLivraisonXmlSheet.TEMPLATE_ID, BonLivraisonXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("BON_DE_LIVRAISON"));
|
141 |
register(BonLivraisonXmlSheet.TEMPLATE_ID, BonLivraisonXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("BON_DE_LIVRAISON"));
|
139 |
register(AvoirClientXmlSheet.TEMPLATE_ID, AvoirClientXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("AVOIR_CLIENT"));
|
142 |
register(AvoirClientXmlSheet.TEMPLATE_ID, AvoirClientXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("AVOIR_CLIENT"));
|
140 |
register(AvoirFournisseurXmlSheet.TEMPLATE_ID, AvoirFournisseurXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("AVOIR_FOURNISSEUR"));
|
143 |
register(AvoirFournisseurXmlSheet.TEMPLATE_ID, AvoirFournisseurXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("AVOIR_FOURNISSEUR"));
|
141 |
register(BonReceptionXmlSheet.TEMPLATE_ID, BonReceptionXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("BON_RECEPTION"));
|
144 |
register(BonReceptionXmlSheet.TEMPLATE_ID, BonReceptionXmlSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("BON_RECEPTION"));
|
Line 227... |
Line 230... |
227 |
if (!configuration.isOnCloud()) {
|
230 |
if (!configuration.isOnCloud()) {
|
228 |
provider = new DefaultLocalTemplateProvider();
|
231 |
provider = new DefaultLocalTemplateProvider();
|
229 |
if (property != null) {
|
232 |
if (property != null) {
|
230 |
File storage = new File(property);
|
233 |
File storage = new File(property);
|
231 |
((DefaultLocalTemplateProvider) provider).setBaseDirectory(storage);
|
234 |
((DefaultLocalTemplateProvider) provider).setBaseDirectory(storage);
|
- |
|
235 |
} else if (VMLauncher.getJPackageAppDir() != null) {
|
- |
|
236 |
((DefaultLocalTemplateProvider) provider).setBaseDirectory(new File(VMLauncher.getJPackageAppDir(), "Configuration/Template/Default"));
|
232 |
}
|
237 |
}
|
233 |
} else {
|
238 |
} else {
|
234 |
provider = new DefaultCloudTemplateProvider(configuration.getSocieteID());
|
239 |
provider = new DefaultCloudTemplateProvider(configuration.getSocieteID());
|
235 |
}
|
240 |
}
|
236 |
|
241 |
|