Merged in hotfix/2021-06-01 (pull request #89)

IO-1178 Resolve minor bugs.
This commit is contained in:
Patrick Fic
2021-06-01 21:37:22 +00:00
6 changed files with 29 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
<babeledit_project be_version="2.7.1" version="1.2"> <babeledit_project version="1.2" be_version="2.7.1">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -18668,6 +18668,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>pac</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>pae</name> <name>pae</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

View File

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

View File

@@ -215,7 +215,7 @@ export default function JobLinesUpsertModalComponent({
name="prt_dsmk_p" name="prt_dsmk_p"
initialValue={0} initialValue={0}
> >
<InputCurrency precision={0} min={0} max={100} /> <InputNumber precision={0} min={0} max={100} />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
</Form> </Form>

View File

@@ -1140,6 +1140,7 @@
"ownr_ea": "Email", "ownr_ea": "Email",
"ownr_ph1": "Phone 1", "ownr_ph1": "Phone 1",
"paa": "Aftermarket", "paa": "Aftermarket",
"pac": "Rechrome",
"pae": "Existing", "pae": "Existing",
"pag": "Glass", "pag": "Glass",
"pal": "LKQ", "pal": "LKQ",

View File

@@ -1140,6 +1140,7 @@
"ownr_ea": "Email", "ownr_ea": "Email",
"ownr_ph1": "Teléfono 1", "ownr_ph1": "Teléfono 1",
"paa": "", "paa": "",
"pac": "",
"pae": "", "pae": "",
"pag": "", "pag": "",
"pal": "", "pal": "",

View File

@@ -1140,6 +1140,7 @@
"ownr_ea": "Email", "ownr_ea": "Email",
"ownr_ph1": "Téléphone 1", "ownr_ph1": "Téléphone 1",
"paa": "", "paa": "",
"pac": "",
"pae": "", "pae": "",
"pag": "", "pag": "",
"pal": "", "pal": "",