C2C-479: Fix invoice endpoint (#15)

Author: VaishSiddharth

api/src/main/java/org/openmrs/module/erp/api/impl/odoo/OdooInvoiceServiceImpl.java

@@ -22,8 +22,12 @@ public class OdooInvoiceServiceImpl implements ErpInvoiceService {
 
 	private static final String INVOICE_MODEL = "account.move";
 
-	private ArrayList<String> invoiceDefaultAttributes = new ArrayList<String>(Arrays.asList("name", "amount_total", "state",
-	    "pricelist_id", "payment_term_id", "invoice_status", "origin", "create_date", "currency_id"));
+	private ArrayList<String> invoiceDefaultAttributes = new ArrayList<String>(
+	        Arrays.asList("id", "name", "date", "state", "invoice_date", "invoice_date_due", "payment_state", "amount_total",
+	            "amount_residual", "currency_id", "partner_id", "invoice_origin", "create_date"));
+	
+	private ArrayList<String> invoiceLineAttributes = new ArrayList<String>(Arrays.asList("id", "name", "quantity",
+	    "product_uom_id", "move_id", "product_id", "price_unit", "price_subtotal", "price_total", "display_type"));
 
 	@Autowired
 	private OdooClient odooClient;
@@ -57,7 +61,12 @@ public Map<String, Object> getInvoiceById(String invoiceId) {
 		try {
 
 			Object[] records = (Object[]) odooClient.execute("read", INVOICE_MODEL,
-			    Collections.singletonList(Integer.parseInt(invoiceId)), null);
+			    Collections.singletonList(Integer.parseInt(invoiceId)), new HashMap() {
+				    
+				    {
+					    put("fields", invoiceDefaultAttributes);
+				    }
+			    });
 
 			if ((records != null) && (records.length > 0)) {
 				Map record = (Map) records[0];
@@ -95,7 +104,7 @@ public List<Map<String, Object>> getInvoicesByFilters(List<Filter> filters) {
 				filterCollection.add(asList(filter.getFieldName(), filter.getComparison(), filter.getValue()));
 			}
 
-			ArrayList<String> fields = odooClient.getDomainFields(INVOICE_MODEL);
+			ArrayList<String> fields = invoiceDefaultAttributes;
 			Object[] records = (Object[]) odooClient.execute("search_read", INVOICE_MODEL, filterCollection, new HashMap() {
 
 				{
@@ -144,7 +153,7 @@ private List<Map<String, Object>> getInvoiceLinesByInvoiceId(String invoiceId) {
 
 			filterCollection.add(condition);
 
-			ArrayList<String> fields = odooClient.getDomainFields("account.move.line");
+			ArrayList<String> fields = invoiceLineAttributes;
 			Object[] records = (Object[]) odooClient.execute("search_read", "account.move.line", filterCollection,
 			    new HashMap() {
 
@@ -163,6 +172,7 @@ private List<Map<String, Object>> getInvoiceLinesByInvoiceId(String invoiceId) {
 						Object value = rec.get(field);
 						result.put(field, value);
 					}
+					result.put("exclude_from_invoice_tab", isExcludedFromInvoiceTab(result.get("display_type")));
 					response.add(result);
 				});
 			}
@@ -172,4 +182,11 @@ private List<Map<String, Object>> getInvoiceLinesByInvoiceId(String invoiceId) {
 		}
 		return response;
 	}
+	
+	private boolean isExcludedFromInvoiceTab(Object displayType) {
+		if (displayType == null || Boolean.FALSE.equals(displayType)) {
+			return false;
+		}
+		return !"product".equals(displayType);
+	}
 }

api/src/main/java/org/openmrs/module/erp/api/utils/ErpPropertiesFile.java

@@ -25,7 +25,8 @@ public static File getFile() {
 		if (file.exists()) {
 			return file;
 		}
-		LogFactory.getLog(ErpPropertiesFile.class).warn("Could not find erp.properties file in directory: " + file.getParent() + ". Failing over to location /etc/properties/.");
+		LogFactory.getLog(ErpPropertiesFile.class).warn("Could not find erp.properties file in directory: "
+		        + file.getParent() + ". Failing over to location /etc/properties/.");
 		return new File("/etc/properties/", fileName);
 	}
 

omod/src/main/java/org/openmrs/module/erp/web/controller/ErpInvoiceController.java

@@ -23,7 +23,7 @@ public class ErpInvoiceController {
 	@Autowired
 	@Qualifier(ErpConstants.COMPONENT_ODOO_INVOICE_SERVICE)
 	protected ErpInvoiceService erpInvoiceService;
-		
+	
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public Object getInvoicesByFilters(@RequestBody String jsonString,

omod/src/main/java/org/openmrs/module/erp/web/controller/ErpPartnerController.java

@@ -29,7 +29,7 @@ public class ErpPartnerController extends BaseRestController {
 	@ResponseBody
 	public Object getErpPartnersByFilters(@RequestBody String jsonString,
 	                                      @RequestParam(value = "rep", defaultValue = "default") String rep) {
-
+		
 		RecordRepresentation recordRepresentation = new RecordRepresentation(erpPartnerService.defaultModelAttributes());
 
 		ArrayList<Filter> filtersArray = new ArrayList<>();
@@ -62,7 +62,7 @@ public Object getErpPartnersByFilters(@RequestBody String jsonString,
 	@ResponseBody
 	public Object getErpPartnerById(@PathVariable("id") String id,
 	                                @RequestParam(value = "rep", defaultValue = "default") String rep) {
-
+		
 		return new RecordRepresentation(erpPartnerService.defaultModelAttributes())
 		        .getRepresentedRecord(erpPartnerService.getErpPartnerById(id), rep);
 	}