Author: jpepin Date: 2010-04-19 18:51:59 +0200 (Mon, 19 Apr 2010) New Revision: 2867 Log: Ajout formulaire cr?\195?\169ation compte de tiers Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-04-19 15:15:40 UTC (rev 2866) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-04-19 16:51:59 UTC (rev 2867) @@ -25,8 +25,6 @@ import java.util.List; import java.util.ListIterator; -import javassist.bytecode.Descriptor.Iterator; - import javax.ejb.Stateless; import org.apache.commons.collections.CollectionUtils; @@ -126,20 +124,9 @@ // TODO move it into JTA transaction = rootContext.beginTransaction(); - // test si le numero de compte existe deja - - - - + // test si le numero de compte existe deja AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(transaction); - - - - /* Suggestion Florian qui marche pas - * List<Account> existingAccounts = - accountDAO.findAllByAccountNumber(account.getAccountNumber()); - if (CollectionUtils.isNotEmpty(existingAccounts))*/ Account existAccount = accountDAO.findByAccountNumber(account.getAccountNumber()); if (existAccount != null) { @@ -186,9 +173,8 @@ // test si le numero de compte existe deja AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(transaction); - List<Account> existingAccounts = - accountDAO.findAllByAccountNumber(account.getAccountNumber()); - if (CollectionUtils.isNotEmpty(existingAccounts)) { + Account existAccount = accountDAO.findByAccountNumber(account.getAccountNumber()); + if (existAccount != null) { throw new LimaBusinessException(_( "An account already exists with this number : %s", account.getAccountNumber())); Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx 2010-04-19 15:15:40 UTC (rev 2866) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx 2010-04-19 16:51:59 UTC (rev 2867) @@ -17,13 +17,16 @@ <JDialog defaultCloseOperation="dispose_on_close" modal="true"> + <org.chorem.lima.entity.Identity id="identity" javaBean='null'/> <org.chorem.lima.entity.Account id="account" javaBean='null'/> + <Boolean id="addState" javaBean='true'/> <script> <![CDATA[ protected void performCancel() { setAccount(null); + setIdentity(null); dispose(); } ]]> @@ -61,8 +64,129 @@ selectedItem="{getAccount().getType()}" onActionPerformed="getAccount().setType((String)getTypeComboBox().getSelectedItem())"/> </cell> + </row> + <!-- NAME CONTACT--> + <row> + <cell fill="horizontal"> + <JLabel text="lima.identity.name"/> + </cell> + <cell fill="horizontal"> + <JTextField id="nameIdentityTextField" text="{getIdentity().getName()}"/> + <javax.swing.text.Document javaBean="getNameIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setName(getNameIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setName(getNameIdentityTextField().getText())' /> + </cell> + <cell fill="horizontal"> + <JLabel text="lima.identity.contact"/> + </cell> + <cell fill="horizontal"> + <JTextField id="contactIdentityTextField" text="{getIdentity().getContact()}"/> + <javax.swing.text.Document javaBean="getContactIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setContact(getContactIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setContact(getContactIdentityTextField().getText())' /> + </cell> </row> + <!-- SIRET--> <row> + <cell fill="horizontal"> + <JLabel text="lima.identity.siret"/> + </cell> + <cell fill="horizontal"> + <JTextField id="SiretIdentityTextField" text="{getIdentity().getSiret()}"/> + <javax.swing.text.Document javaBean="getSiretIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setSiret(getZIPCodeIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setSiret(getZIPCodeIdentityTextField().getText())' /> + </cell> + </row> + <!-- ADDRESS --> + <row> + <cell fill="horizontal"> + <JLabel text="lima.identity.address"/> + </cell> + <cell fill="horizontal"> + <JTextField id="addressIdentityTextField" text="{getIdentity().getAddress()}"/> + <javax.swing.text.Document javaBean="getAddressIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setAddress(getAddressIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setAddress(getAddressIdentityTextField().getText())' /> + </cell> + </row> + <!-- ZIPCODE CITY--> + <row> + <cell fill="horizontal"> + <JLabel text="lima.identity.zipcode"/> + </cell> + <cell fill="horizontal"> + <JTextField id="ZIPCodeIdentityTextField" text="{getIdentity().getZIPCode()}"/> + <javax.swing.text.Document javaBean="getZIPCodeIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setZIPCode(getZIPCodeIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setZIPCode(getZIPCodeIdentityTextField().getText())' /> + </cell> + <cell fill="horizontal"> + <JLabel text="lima.identity.city"/> + </cell> + <cell fill="horizontal"> + <JTextField id="cityIdentityTextField" text="{getIdentity().getCity()}"/> + <javax.swing.text.Document javaBean="getCityIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setCity(getCityIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setCity(getCityIdentityTextField().getText())' /> + </cell> + </row> + <!-- COUNTRY--> + <row> + <cell fill="horizontal"> + <JLabel text="lima.identity.country"/> + </cell> + <cell fill="horizontal"> + <JTextField id="CountryIdentityTextField" text="{getIdentity().getCountry()}"/> + <javax.swing.text.Document javaBean="getCountryIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setCountry(getZIPCodeIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setCountry(getZIPCodeIdentityTextField().getText())' /> + </cell> + </row> + <!-- PHONE FAX--> + <row> + <cell fill="horizontal"> + <JLabel text="lima.identity.phone"/> + </cell> + <cell fill="horizontal"> + <JTextField id="phoneIdentityTextField" text="{getIdentity().getPhone()}"/> + <javax.swing.text.Document javaBean="getPhoneIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setPhone(getPhoneIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setPhone(getPhoneIdentityTextField().getText())' /> + </cell> + <cell fill="horizontal"> + <JLabel text="lima.identity.fax"/> + </cell> + <cell fill="horizontal"> + <JTextField id="faxIdentityTextField" text="{getIdentity().getFax()}"/> + <javax.swing.text.Document javaBean="getFaxIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setFax(getFaxIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setFax(getFaxIdentityTextField().getText())' /> + </cell> + </row> + <!-- fin fiche identite EMAIL WEBSITE--> + <row> + <cell fill="horizontal"> + <JLabel text="lima.identity.email"/> + </cell> + <cell fill="horizontal"> + <JTextField id="emailIdentityTextField" text="{getIdentity().getEmail()}"/> + <javax.swing.text.Document javaBean="getEmailIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setEmail(getEmailIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setEmail(getEmailIdentityTextField().getText())' /> + </cell> + <cell fill="horizontal"> + <JLabel text="lima.identity.website"/> + </cell> + <cell fill="horizontal"> + <JTextField id="websiteIdentityTextField" text="{getIdentity().getWebsite()}"/> + <javax.swing.text.Document javaBean="getWebsiteIdentityTextField().getDocument()" + onInsertUpdate='getIdentity().setWebsite(getWebsiteIdentityTextField().getText())' + onRemoveUpdate='getIdentity().setWebsite(getWebsiteIdentityTextField().getText())' /> + </cell> + </row> + <!-- fin fiche identite --> + <row> <cell fill="none"> <JButton text="lima.common.ok" onActionPerformed="dispose()"/> </cell> Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-04-19 15:15:40 UTC (rev 2866) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-04-19 16:51:59 UTC (rev 2867) @@ -143,6 +143,18 @@ lima.fiscalyear.listclosed= lima.grand.livre=General Ledger lima.home=Home - TODO +lima.identity.address= +lima.identity.adress= +lima.identity.city= +lima.identity.contact= +lima.identity.country= +lima.identity.email= +lima.identity.fax= +lima.identity.name= +lima.identity.phone= +lima.identity.siret= +lima.identity.website= +lima.identity.zipcode= lima.import=Import lima.import.account=Import PCG lima.import.all=Import all datas @@ -233,9 +245,9 @@ lima.progressBar.load.etape4=Loading periods lima.progressBar.load.etape5=Loading transactions lima.question=Question +lima.question.confirmremove.account=This account have subaccounts, do you want remove this account ? lima.question.load.accounts=There is no existing accounts in Lima. Do you want to load default accounts ? lima.question.remove.account=Do you want to remove this account ? -lima.question.confirmremove.account=This account have subaccounts, do you want remove this account ? lima.question.remove.entry=Do you want to remove this entry ? lima.question.remove.journal=Do you want to remove this journal ? lima.question.remove.transaction=Do you want to remove this transaction ? @@ -262,6 +274,8 @@ lima.status.tr.wip=Work in progress lima.subledger.accountnumber= lima.subledger.code=Code +lima.subledger.label= +lima.subledger.type= lima.success=Success lima.tab.account=Account lima.tab.balance=Balance Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-04-19 15:15:40 UTC (rev 2866) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-04-19 16:51:59 UTC (rev 2867) @@ -142,6 +142,17 @@ lima.fiscalyear.listclosed=Voir toutes les cl\u00F4tures lima.grand.livre=Grand-Livre lima.home=Page d'accueil - TODO +lima.identity.address=Adresse +lima.identity.city=Ville +lima.identity.contact=Contact +lima.identity.country=Pays +lima.identity.email=eMail +lima.identity.fax=Fax +lima.identity.name=Nom +lima.identity.phone=Tel +lima.identity.siret=Siret +lima.identity.website=Site Web +lima.identity.zipcode=Code Postal lima.import=Import lima.import.account=Importer le PCG lima.import.all=Importer une nouvelle base (XML) @@ -226,9 +237,9 @@ lima.progressBar.load.etape4=Chargement des p\u00E9riodes lima.progressBar.load.etape5=Chargement des transactions lima.question=Question +lima.question.confirmremove.account=Ce compte poss\u00E8de des sous comptes, voulez-vous supprimer ce compte ? lima.question.load.accounts=Il n'y a aucun plan comptable existant dans Lima. Voulez-vous en charger un par d\u00E9faut ? lima.question.remove.account=Voulez-vous supprimer ce compte? -lima.question.confirmremove.account=Ce compte poss\u00E8de des sous comptes, voulez-vous supprimer ce compte ? lima.question.remove.entry=Voulez-vous supprimer cette ligne de transaction? lima.question.remove.journal=Voulez-vous supprimer ce journal? lima.question.remove.transaction=Voulez-vous supprimer cette transaction? @@ -252,7 +263,10 @@ lima.status.tr.balanced=Equilibr\u00E9e lima.status.tr.finalized=Valid\u00E9e lima.status.tr.wip=En cours +lima.subledger.accountnumber= lima.subledger.code=Code +lima.subledger.label= +lima.subledger.type= lima.success=Succ\u00E8s lima.tab.account=Plan Comptable lima.tab.balance=Balance