GiuseppeS
d7eeeeeac2
# Conflicts: # .idea/deploymentTargetSelector.xml # app/build.gradle # app/src/main/java/it/integry/integrywmsnative/core/menu/MenuRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/rest/OrdiniAccettazioneRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java # app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java # app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java