WebSVN - OpenConcerto - Path Comparison

Regard whitespace Rev 160 → Rev 159

 /trunk/Modules/Module Lead/src/org/openconcerto/modules/customerrelationship/lead/Module.java
 ,6 → 14,7
 import org.openconcerto.erp.action.CreateFrameAbstractAction;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
+import org.openconcerto.erp.config.Gestion;
 import org.openconcerto.erp.config.MainFrame;
 import org.openconcerto.erp.modules.AbstractModule;
 import org.openconcerto.erp.modules.ComponentsContext;
 ,6 → 21,9
 import org.openconcerto.erp.modules.DBContext;
 import org.openconcerto.erp.modules.MenuContext;
 import org.openconcerto.erp.modules.ModuleFactory;
+import org.openconcerto.erp.modules.ModuleManager;
+import org.openconcerto.erp.modules.ModulePackager;
+import org.openconcerto.erp.modules.RuntimeModuleFactory;
 import org.openconcerto.modules.customerrelationship.lead.call.CustomerCallSQLElement;
 import org.openconcerto.modules.customerrelationship.lead.call.CustomerCallServiceSQLElement;
 import org.openconcerto.modules.customerrelationship.lead.call.LeadCallSQLElement;
 ,9 → 40,11
 import org.openconcerto.sql.model.ConnectionHandlerNoSetup;
 import org.openconcerto.sql.model.DBRoot;
 import org.openconcerto.sql.model.SQLDataSource;
+import org.openconcerto.sql.model.SQLRequestLog;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.model.SQLTable;
+import org.openconcerto.sql.ui.ConnexionPanel;
 import org.openconcerto.sql.utils.SQLCreateTable;
 import org.openconcerto.sql.utils.SQLUtils;
 import org.openconcerto.sql.view.EditFrame;
 ,4 → 311,20
     protected void 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"));
+        // final ModuleFactory factory = new JarModuleFactory(jar);
+        ModuleManager.getInstance().addFactories(new File("../OpenConcerto/Modules"));
+        ModuleManager.getInstance().addFactoryAndStart(factory, false);
+        Gestion.main(args);
 }
+}

/trunk/Modules/Module Lead/src/org/openconcerto/modules/customerrelationship/lead/SQLElementNames_en.xml
New file
0,0 → 1,3
<translations>
<element refid="customerrelationship.lead" name="lead" />
</translations>

/trunk/Modules/Module Lead/src/org/openconcerto/modules/customerrelationship/lead/LeadSQLElement.java
27,7 → 27,9
import org.openconcerto.sql.model.SQLTable;
import org.openconcerto.sql.model.Where;
import org.openconcerto.sql.model.graph.Path;
import org.openconcerto.sql.users.User;
import org.openconcerto.sql.users.UserManager;
import org.openconcerto.sql.users.rights.UserRights;
import org.openconcerto.sql.users.rights.UserRightsManager;
import org.openconcerto.sql.view.EditFrame;
import org.openconcerto.sql.view.EditPanel.EditMode;
52,6 → 54,7

public LeadSQLElement(final AbstractModule module) {
super(module, Module.TABLE_LEAD);
this.setL18nLocation(LeadSQLElement.class);

// Call
final RowAction.PredicateRowAction addCallAction = new RowAction.PredicateRowAction(new AbstractAction("Appeler") {

 /trunk/Modules/Module Lead/src/org/openconcerto/modules/customerrelationship/lead/SQLElementNames_fr.xml
 New file
 ,0 → 1,22
+<translations>
+        <element refid="customerrelationship.lead" nameClass="masculine" name="prospect" />
+        <element refid="org.openconcerto.modules.customerrelationship.lead/CUSTOMER_VISIT" nameClass="masculine"
+                name="rapport de visite client" namePlural="rapports de visite client" />
+        <element refid="org.openconcerto.modules.customerrelationship.lead/LEAD_VISIT" nameClass="masculine"
+                name="rapport de visite prospect" namePlural="rapports de visite prospect" />
+        <element refid="org.openconcerto.modules.customerrelationship.lead/CUSTOMER_CALL" nameClass="masculine"
+                name="rapport d'appel client" namePlural="rapports d'appel client" />
+        <element refid="org.openconcerto.modules.customerrelationship.lead/LEAD_CALL" nameClass="masculine"
+                name="rapport d'appel prospect" namePlural="rapports d'appel prospect" />
+        <element refid="org.openconcerto.modules.customerrelationship.lead/CUSTOMER_VISIT_SERVICE" nameClass="masculine"
+                name="service associé à un rapport de visite client" namePlural="services associés à des rapports de visite client" />
+        <element refid="org.openconcerto.modules.customerrelationship.lead/LEAD_VISIT_SERVICE" nameClass="masculine"
+                name="service associé à un rapport de visite prospect" namePlural="services associés à des rapports de visite prospect" />
+        <element refid="org.openconcerto.modules.customerrelationship.lead/CUSTOMER_CALL_SERVICE" nameClass="masculine"
+                name="service associé à un rapport d'appel client" namePlural="services associés à des rapports d'appel client" />
+        <element refid="org.openconcerto.modules.customerrelationship.lead/LEAD_CALL_SERVICE" nameClass="masculine"
+                name="service associé à un rapport d'appel prospect" namePlural="services associés à des rapports d'appel prospect" />
+        <element refid="org.openconcerto.modules.customerrelationship.lead/SERVICE" nameClass="masculine" name="service" />
+</translations>

 /trunk/Modules/Module Lead/src/org/openconcerto/modules/customerrelationship/lead/labels_fr.xml
 ,6 → 1,6
 <?xml version="1.0" encoding="UTF-8" ?>
 <ROOT>
-        <element refid="customerrelationship.lead" nameClass="masculine" name="prospect">
+        <TABLE name="LEAD">
                 <FIELD name="DISPO" label="Disponibilité" />
                 <FIELD name="REMIND_DATE" label="Date de rappel" />
                 <FIELD name="ROLE" label="Fonction" />
 ,65 → 27,42
                 <FIELD name="ID_COMMERCIAL" label="Assigné à" titlelabel="Assigné à" />
                 <FIELD name="ID_CLIENT" label="Client" titlelabel="Client" />
                 <FIELD name="ID_TITRE_PERSONNEL" label="Civilité" titlelabel="Civilité" />
-        </element>
+        </TABLE>
         <TABLE name="DEVIS">
                 <FIELD name="REMIND_DATE" label="Date de rappel" />
         </TABLE>
-        <element refid="org.openconcerto.modules.customerrelationship.lead/LEAD_CALL" nameClass="masculine"
-                name="rapport d'appel prospect" namePlural="rapports d'appel prospect">
+        <TABLE name="LEAD_CALL">
                 <FIELD name="DATE" label="Date de l'appel" />
                 <FIELD name="ID_LEAD" label="Entreprise" />
                 <FIELD name="INFORMATION" label="Résumé de l'appel" />
                 <FIELD name="NEXTCONTACT_DATE" label="Date de prochain contact" />
                 <FIELD name="NEXTCONTACT_INFO" label="Motif de prochain contact" />
-        </element>
-        <element refid="org.openconcerto.modules.customerrelationship.lead/LEAD_CALL_SERVICE" nameClass="masculine"
-                name="service associé à un rapport d'appel prospect" namePlural="services associés à des rapports d'appel prospect">
-        </element>
-        <element refid="org.openconcerto.modules.customerrelationship.lead/CUSTOMER_CALL" nameClass="masculine"
-                name="rapport d'appel client" namePlural="rapports d'appel client">
+        </TABLE>
+        <TABLE name="CUSTOMER_CALL">
                 <FIELD name="DATE" label="Date de l'appel" />
                 <FIELD name="ID_CLIENT" label="Client" />
                 <FIELD name="INFORMATION" label="Résumé de l'appel" />
                 <FIELD name="NEXTCONTACT_DATE" label="Date de prochain contact" />
                 <FIELD name="NEXTCONTACT_INFO" label="Motif de prochain contact" />
-        </element>
-        <element refid="org.openconcerto.modules.customerrelationship.lead/CUSTOMER_CALL_SERVICE" nameClass="masculine"
-                name="service associé à un rapport d'appel client" namePlural="services associés à des rapports d'appel client">
-        </element>
-        <element refid="org.openconcerto.modules.customerrelationship.lead/LEAD_VISIT" nameClass="masculine"
-                name="rapport de visite prospect" namePlural="rapports de visite prospect">
+        </TABLE>
+        <TABLE name="LEAD_VISIT">
                 <FIELD name="DATE" label="Date de visite" />
                 <FIELD name="ID_LEAD" label="Entreprise" />
                 <FIELD name="INFORMATION" label="Compte rendu de visite" />
                 <FIELD name="NEXTCONTACT_DATE" label="Date de prochain contact" />
                 <FIELD name="NEXTCONTACT_INFO" label="Motif de prochain contact" />
-        </element>
-        <element refid="org.openconcerto.modules.customerrelationship.lead/LEAD_VISIT_SERVICE" nameClass="masculine"
-                name="service associé à un rapport de visite prospect"
-                namePlural="services associés à des rapports de visite prospect">
-        </element>
-        <element refid="org.openconcerto.modules.customerrelationship.lead/CUSTOMER_VISIT" nameClass="masculine"
-                name="rapport de visite client" namePlural="rapports de visite client">
+        </TABLE>
+        <TABLE name="CUSTOMER_VISIT">
                 <FIELD name="DATE" label="Date de visite" />
                 <FIELD name="ID_CLIENT" label="Client" />
                 <FIELD name="INFORMATION" label="Compte rendu de visite" />
                 <FIELD name="NEXTCONTACT_DATE" label="Date de prochain contact" />
                 <FIELD name="NEXTCONTACT_INFO" label="Motif de prochain contact" />
-        </element>
-        <element refid="org.openconcerto.modules.customerrelationship.lead/CUSTOMER_VISIT_SERVICE"
-                nameClass="masculine" name="service associé à un rapport de visite client"
-                namePlural="services associés à des rapports de visite client">
-        </element>
-        <element refid="org.openconcerto.modules.customerrelationship.lead/SERVICE" nameClass="masculine"
-                name="service">
+        </TABLE>
+        <TABLE name="SERVICE">
                 <FIELD name="NAME" label="Libellé" />
-        </element>
+        </TABLE>
 </ROOT>

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

svn://code.openconcerto.org/openconcerto

Compare Revisions

Regard whitespace Rev 160 → Rev 159