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={() => {

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -71,8 +71,7 @@ export default function PartsOrderModalComponent({
             <div>
               {fields.map((field, index) => (
                 <Form.Item required={false} key={field.key}>
-                  <div style={{ display: "flex", alignItems: "center" }}>
+                  <LayoutFormRow grow noDivider>
-                    <LayoutFormRow style={{ flex: 1 }} noDivider>
                     <Form.Item
                       label={t("parts_orders.fields.line_desc")}
                       key={`${index}line_desc`}
@@ -125,7 +124,8 @@ export default function PartsOrderModalComponent({
                         <CurrencyInput />
                       </Form.Item>
                     )}
-                    </LayoutFormRow>
+
+                    <div>
                       <DeleteFilled
                         style={{ margin: "1rem" }}
                         onClick={() => {
@@ -138,6 +138,7 @@ export default function PartsOrderModalComponent({
                         total={fields.length}
                       />
                     </div>
+                  </LayoutFormRow>
                 </Form.Item>
               ))}
             </div>

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -236,9 +236,9 @@ export function PartsOrderModalContainer({
           : t("parts_orders.labels.newpartsorder")
       }
       onCancel={() => toggleModalVisible()}
-      width="90%"
       onOk={() => form.submit()}
       destroyOnClose
+      width="50%"
       forceRender
     >
       {error ? <AlertComponent message={error.message} type="error" /> : null}