diff --git a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
index 2b18e3c8b..2d964f1a0 100644
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -1,5 +1,13 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Drawer, Form, Grid, PageHeader, Popconfirm } from "antd";
+import {
+  Button,
+  Drawer,
+  Form,
+  Grid,
+  PageHeader,
+  Popconfirm,
+  Space,
+} from "antd";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useEffect, useState } from "react";
@@ -15,7 +23,24 @@ import BillFormContainer from "../bill-form/bill-form.container";
 import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 
-export default function BillDetailEditcontainer() {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  setPartsOrderContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillDetailEditcontainer);
+
+export function BillDetailEditcontainer({ setPartsOrderContext }) {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
   const { t } = useTranslation();
@@ -145,23 +170,53 @@ export default function BillDetailEditcontainer() {
               `${data.bills_by_pk.invoice_number} - ${data.bills_by_pk.vendor.name}`
             }
             extra={
-              <Popconfirm
-                visible={visible}
-                onConfirm={() => form.submit()}
-                onCancel={() => setVisible(false)}
-                okButtonProps={{ loading: updateLoading }}
-                title={t("bills.labels.editadjwarning")}
-              >
+              <Space>
                 <Button
-                  htmlType="submit"
-                  disabled={exported}
-                  onClick={handleSave}
-                  loading={updateLoading}
-                  type="primary"
+                  disabled={data.bills_by_pk.is_credit_memo}
+                  onClick={() =>
+                    setPartsOrderContext({
+                      actions: {},
+                      context: {
+                        jobId: data.bills_by_pk.jobid,
+                        vendorId: data.bills_by_pk.vendorid,
+                        returnFromBill: data.bills_by_pk.id,
+                        invoiceNumber: data.bills_by_pk.invoice_number,
+                        linesToOrder: data.bills_by_pk.billlines.map((i) => {
+                          return {
+                            line_desc: i.line_desc,
+                            //  db_price: i.actual_price,
+                            act_price: i.actual_price,
+                            cost: i.actual_cost,
+                            quantity: i.quantity,
+                            joblineid: i.joblineid,
+                          };
+                        }),
+                        isReturn: true,
+                      },
+                    })
+                  }
                 >
-                  {t("general.actions.save")}
+                  {t("bills.actions.return")}
                 </Button>
-              </Popconfirm>
+
+                <Popconfirm
+                  visible={visible}
+                  onConfirm={() => form.submit()}
+                  onCancel={() => setVisible(false)}
+                  okButtonProps={{ loading: updateLoading }}
+                  title={t("bills.labels.editadjwarning")}
+                >
+                  <Button
+                    htmlType="submit"
+                    disabled={exported}
+                    onClick={handleSave}
+                    loading={updateLoading}
+                    type="primary"
+                  >
+                    {t("general.actions.save")}
+                  </Button>
+                </Popconfirm>
+              </Space>
             }
           />
           <Form
diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx
index bd089873e..cbe5ebca6 100644
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -250,8 +250,9 @@ export function BillsListPage({
 
       <Table
         loading={loading}
-        scroll={{ x: "50%",// y: "40rem"
-       }}
+        scroll={{
+          x: "50%", // y: "40rem"
+        }}
         pagination={{
           position: "top",
           pageSize: 25,