SOPHAL/ERP
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Edit = set Default Purchase Journal for Supplier

Browse Source
This commit is contained in:
walid seghier
2023-01-24 16:20:38 +01:00
parent 2b4f207deb
commit 140b4c254a
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/axelor-open-suite/axelor-account/src/main/java/com/axelor/apps/account/web/InvoiceController.java
View File

@@ -1067,17 +1067,16 @@ public class InvoiceController {
Invoice invoice = request.getContext().asType(Invoice.class); Invoice invoice = request.getContext().asType(Invoice.class);
Company company = invoice.getCompany(); Company company = invoice.getCompany();
Partner partner = invoice.getPartner(); Partner partner = invoice.getPartner();
PartnerCategory partnerCategory = partner.getPartnerCategory();
Journal journal = null ; Journal journal = null ;
Integer operationTypeSelect = invoice.getOperationTypeSelect(); Integer operationTypeSelect = invoice.getOperationTypeSelect();
if (company != null && partner != null && operationTypeSelect != null ) { if (company != null && partner != null && operationTypeSelect != null ) {
if (operationTypeSelect.intValue() == InvoiceRepository.OPERATION_TYPE_SUPPLIER_PURCHASE) { if (operationTypeSelect.intValue() == InvoiceRepository.OPERATION_TYPE_SUPPLIER_PURCHASE) {
if( partnerCategory != null){ if( partner.getTypeOfSupplier() != null){
if(partnerCategory.getCode().equals("FRETG")){ if(partner.getTypeOfSupplier().equals("1")){
journal = company.getAccountConfig().getSupplierPurchaseJournalForeigners(); journal = company.getAccountConfig().getSupplierPurchaseJournalForeigners();
} }
if(partnerCategory.getCode().equals("FRLOC")){ if(partner.getTypeOfSupplier().equals("2")){
journal = company.getAccountConfig().getSupplierPurchaseJournalLocal(); journal = company.getAccountConfig().getSupplierPurchaseJournalLocal();
} }
} }

1
modules/axelor-open-suite/axelor-base/src/main/resources/domains/Partner.xml
View File

@@ -98,6 +98,7 @@
<string name="proformaComments" title="Comment to display on proforma" large="true"/> <string name="proformaComments" title="Comment to display on proforma" large="true"/>
<many-to-one name="barCodeSeq" title="Barcode" ref="com.axelor.meta.db.MetaFile" /> <many-to-one name="barCodeSeq" title="Barcode" ref="com.axelor.meta.db.MetaFile" />
<string name="typeOfSupplier" title="Type of supplier" selection="partner.supplier.type.select"/>
<finder-method name="findByUser" using="user"/> <finder-method name="findByUser" using="user"/>

5
modules/axelor-open-suite/axelor-base/src/main/resources/views/Selects.xml
View File

@@ -502,5 +502,10 @@
<option value="asc">Ascending</option> <option value="asc">Ascending</option>
<option value="desc">Descending</option> <option value="desc">Descending</option>
</selection> </selection>
<selection name="partner.supplier.type.select">
<option value="1">FOURNISSEURS ETRANGERS</option>
<option value="2">FOURNISSEURS LOCAL</option>
</selection>
</object-views> </object-views>