IO-1029 IO-1027

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -51,15 +51,6 @@ export function BillsListTableComponent({
         </Button>
       )}
       <BillDeleteButton bill={record} />
-      {record.isinhouse && (
-        <PrintWrapperComponent
-          templateObject={{
-            name: Templates.inhouse_invoice.key,
-            variables: { id: record.id },
-          }}
-          messageObject={{ subject: Templates.inhouse_invoice.subject }}
-        />
-      )}
       <Button
         disabled={record.is_credit_memo}
         onClick={() =>
@@ -87,6 +78,15 @@ export function BillsListTableComponent({
       >
         {t("bills.actions.return")}
       </Button>
+      {record.isinhouse && (
+        <PrintWrapperComponent
+          templateObject={{
+            name: Templates.inhouse_invoice.key,
+            variables: { id: record.id },
+          }}
+          messageObject={{ subject: Templates.inhouse_invoice.subject }}
+        />
+      )}
     </Space>
   );
   const columns = [
@@ -167,7 +167,7 @@ export function BillsListTableComponent({
           <Button onClick={() => refetch()}>
             <SyncOutlined />
           </Button>
-          {job ? (
+          {job && job.converted ? (
             <>
               <Button
                 onClick={() => {