IO-1178 Resolve line markup issues.

This commit is contained in:
Patrick Fic
2021-06-01 11:52:09 -07:00
parent bcec0cd902
commit d2bb7121cb
15 changed files with 59 additions and 12 deletions

View File

@@ -157,7 +157,7 @@ export function JobLinesComponent({
render: (text, record) => (
<>
<CurrencyFormatter>{record.act_price}</CurrencyFormatter>
{record.prt_dsmk_p !== 0 && (
{record.prt_dsmk_p && record.prt_dsmk_p !== 0 && (
<span
style={{ marginLeft: ".2rem" }}
>{`(${record.prt_dsmk_p}%)`}</span>

View File

@@ -210,6 +210,13 @@ export default function JobLinesUpsertModalComponent({
>
<InputCurrency precision={2} min={0} />
</Form.Item>
<Form.Item
label={t("joblines.fields.prt_dsmk_p")}
name="prt_dsmk_p"
initialValue={0}
>
<InputCurrency precision={0} min={0} max={100} />
</Form.Item>
</LayoutFormRow>
</Form>
</Modal>

View File

@@ -957,6 +957,7 @@
},
"profitcenter_labor": "Profit Center: Labor",
"profitcenter_part": "Profit Center: Part",
"prt_dsmk_p": "Line Markup %",
"status": "Status",
"total": "Total",
"unq_seq": "Seq #"

View File

@@ -957,6 +957,7 @@
},
"profitcenter_labor": "",
"profitcenter_part": "",
"prt_dsmk_p": "",
"status": "Estado",
"total": "",
"unq_seq": "Seq #"

View File

@@ -957,6 +957,7 @@
},
"profitcenter_labor": "",
"profitcenter_part": "",
"prt_dsmk_p": "",
"status": "Statut",
"total": "",
"unq_seq": "Seq #"