admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature/IO-3083-i18-Translation-Shop-Info-Warning

Browse Source 
resolve conflicts
This commit is contained in:
Dave Richer
2025-01-15 07:49:19 -08:00
parent e1fcb0ecba acd278f5b4
commit f9105806ba
17 changed files with 549 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
View File

@@ -192,6 +192,23 @@ export function JobLinesUpsertModalComponent({ bodyshop, open, jobLine, handleCa
<Form.Item label={t("joblines.fields.tax_part")} name="tax_part" valuePropName="checked" initialValue={true}>
<Switch />
</Form.Item>
<Form.Item dependencies={[["act_price"]]} noStyle>
{() => {
if (form.getFieldValue("act_price") === 0) {
return (
<Form.Item
label={t("joblines.fields.include_in_part_cnt")}
name="include_in_part_cnt"
valuePropName="checked"
>
<Switch />
</Form.Item>
);
} else {
return null;
}
}}
</Form.Item>
</LayoutFormRow>
</Form>
</Modal>

1
client/src/graphql/jobs-lines.queries.js
View File

@@ -238,6 +238,7 @@ export const UPDATE_JOB_LINE = gql`
convertedtolbr
convertedtolbr_data
assigned_team
include_in_part_cnt
}
}
}

1
client/src/graphql/jobs.queries.js
View File

@@ -581,6 +581,7 @@ export const GET_JOB_BY_PK = gql`
status
tax_part
unq_seq
include_in_part_cnt
}
kmin
kmout

41
client/src/translations/en_us/common.json
View File

@@ -256,15 +256,6 @@
}
},
"bodyshop": {
"operations": {
"starts_with": "Starts With",
"contains": "Contains",
"ends_with": "Ends With",
"equals": "Equals",
"not_equals": "Not Equals",
"greater_than": "Greater Than",
"less_than": "Less Than"
},
"actions": {
"add_task_preset": "Add Task Preset",
"addapptcolor": "Add Appointment Color",
@@ -388,10 +379,12 @@
"md_lost_sale_reasons": "Lost Sale Reasons",
"md_parts_order_comment": "Parts Orders Comments",
"md_parts_scan": {
"field": "Field",
"operation": "Operation",
"value": "Value",
"caseInsensitive": "Case Insensitive"
"caseInsensitive": "Case Insensitive",
"expression": "",
"field": "Field",
"flags": "",
"operation": "Operation",
"value": "Value"
},
"md_payment_types": "Payment Types",
"md_referral_sources": "Referral Sources",
@@ -721,7 +714,16 @@
"task-presets": "Task Presets",
"workingdays": "Working Days"
},
"successes": {
"operations": {
"contains": "Contains",
"ends_with": "Ends With",
"equals": "Equals",
"greater_than": "Greater Than",
"less_than": "Less Than",
"not_equals": "Not Equals",
"starts_with": "Starts With"
},
"successes": {
"areyousure": "Are you sure you want to continue?",
"defaultviewcreated": "Default view created successfully.",
"save": "Shop configuration saved successfully. ",
@@ -1434,12 +1436,14 @@
"act_price_before_ppc": "Original Part Price",
"adjustment": "Adjustment",
"ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)",
"amount": "Amount",
"alt_partno": "Alt Part #",
"amount": "Amount",
"assigned_team": "Team",
"assigned_team_name": "Team {{name}}",
"create_ppc": "Create PPC?",
"db_price": "List Price",
"lbr_types": {
"include_in_part_cnt": "Include in Parts Status Count",
"lbr_types": {
"LA1": "LA1",
"LA2": "LA2",
"LA3": "LA3",
@@ -1462,8 +1466,7 @@
"mod_lb_hrs": "Hrs",
"mod_lbr_ty": "Labor Type",
"notes": "Notes",
"oem_partno": "OEM Part #",
"alt_partno": "Alt Part #",
"oem_partno": "OEM Part #",
"op_code_desc": "Op Code Description",
"part_qty": "Qty.",
"part_type": "Part Type",
@@ -3078,7 +3081,7 @@
"purchase_return_ratio_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)",
"purchase_return_ratio_grouped_by_vendor_summary": "Purchase & Return Ratio by Vendor (Summary)",
"purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)",
"purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)",
"purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)","purchases_by_date_excel": "Purchases by Date - Excel",
"purchases_by_date_range_detail": "Purchases by Date - Detail",
"purchases_by_date_range_summary": "Purchases by Date - Summary",
"purchases_by_ro_detail_date": "Purchases by RO - Detail",

38
client/src/translations/es/common.json
View File

@@ -256,15 +256,6 @@
}
},
"bodyshop": {
"operations": {
"starts_with": "",
"contains": "",
"ends_with": "",
"equals": "",
"not_equals": "",
"greater_than": "",
"less_than": ""
},
"actions": {
"add_task_preset": "",
"addapptcolor": "",
@@ -388,10 +379,12 @@
"md_lost_sale_reasons": "",
"md_parts_order_comment": "",
"md_parts_scan": {
"field": "",
"operation": "",
"value": "",
"caseInsensitive": ""
"caseInsensitive": "",
"expression": "",
"field": "",
"flags": "",
"operation": "",
"value": ""
},
"md_payment_types": "",
"md_referral_sources": "",
@@ -721,7 +714,16 @@
"task-presets": "",
"workingdays": ""
},
"successes": {
"operations": {
"contains": "",
"ends_with": "",
"equals": "",
"greater_than": "",
"less_than": "",
"not_equals": "",
"starts_with": ""
},
"successes": {
"areyousure": "",
"defaultviewcreated": "",
"save": "",
@@ -1434,12 +1436,14 @@
"act_price_before_ppc": "",
"adjustment": "",
"ah_detail_line": "",
"amount": "",
"alt_partno": "",
"amount": "",
"assigned_team": "",
"assigned_team_name": "",
"create_ppc": "",
"db_price": "Precio de base de datos",
"lbr_types": {
"include_in_part_cnt": "",
"lbr_types": {
"LA1": "",
"LA2": "",
"LA3": "",
@@ -1463,7 +1467,6 @@
"mod_lbr_ty": "Tipo de trabajo",
"notes": "",
"oem_partno": "OEM parte #",
"alt_partno": "",
"op_code_desc": "",
"part_qty": "",
"part_type": "Tipo de parte",
@@ -3079,6 +3082,7 @@
"purchase_return_ratio_grouped_by_vendor_summary": "",
"purchases_by_cost_center_detail": "",
"purchases_by_cost_center_summary": "",
"purchases_by_date_excel": "",
"purchases_by_date_range_detail": "",
"purchases_by_date_range_summary": "",
"purchases_by_ro_detail_date": "",

38
client/src/translations/fr/common.json
View File

@@ -256,15 +256,6 @@
}
},
"bodyshop": {
"operations": {
"starts_with": "",
"contains": "",
"ends_with": "",
"equals": "",
"not_equals": "",
"greater_than": "",
"less_than": ""
},
"actions": {
"add_task_preset": "",
"addapptcolor": "",
@@ -388,10 +379,12 @@
"md_lost_sale_reasons": "",
"md_parts_order_comment": "",
"md_parts_scan": {
"field": "",
"operation": "",
"value": "",
"caseInsensitive": ""
"caseInsensitive": "",
"expression": "",
"field": "",
"flags": "",
"operation": "",
"value": ""
},
"md_payment_types": "",
"md_referral_sources": "",
@@ -721,7 +714,16 @@
"task-presets": "",
"workingdays": ""
},
"successes": {
"operations": {
"contains": "",
"ends_with": "",
"equals": "",
"greater_than": "",
"less_than": "",
"not_equals": "",
"starts_with": ""
},
"successes": {
"areyousure": "",
"defaultviewcreated": "",
"save": "",
@@ -1434,12 +1436,14 @@
"act_price_before_ppc": "",
"adjustment": "",
"ah_detail_line": "",
"amount": "",
"alt_partno": "",
"amount": "",
"assigned_team": "",
"assigned_team_name": "",
"create_ppc": "",
"db_price": "Prix de la base de données",
"lbr_types": {
"include_in_part_cnt": "",
"lbr_types": {
"LA1": "",
"LA2": "",
"LA3": "",
@@ -1463,7 +1467,6 @@
"mod_lbr_ty": "Type de travail",
"notes": "",
"oem_partno": "Pièce OEM #",
"alt_partno": "",
"op_code_desc": "",
"part_qty": "",
"part_type": "Type de pièce",
@@ -3079,6 +3082,7 @@
"purchase_return_ratio_grouped_by_vendor_summary": "",
"purchases_by_cost_center_detail": "",
"purchases_by_cost_center_summary": "",
"purchases_by_date_excel": "",
"purchases_by_date_range_detail": "",
"purchases_by_date_range_summary": "",
"purchases_by_ro_detail_date": "",

14
client/src/utils/TemplateConstants.js
View File

@@ -2229,7 +2229,19 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_open")
},
group: "jobs"
}
},
purchases_by_date_excel: {
title: i18n.t("reportcenter.templates.purchases_by_date_excel"),
subject: i18n.t("reportcenter.templates.purchases_by_date_excel"),
key: "purchases_by_date_excel",
reporttype: "excel",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date")
},
group: "purchases"
},
}
: {}),
...(!type || type === "courtesycarcontract"