Attempt to result PR conflicts.

This commit is contained in:
Patrick Fic
2021-06-01 12:15:08 -07:00
parent fa3ccf0fea
commit bef01385b2
4 changed files with 6684 additions and 6708 deletions

View File

@@ -15331,27 +15331,6 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>prt_dsmk_p</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>status</name> <name>status</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -31222,27 +31201,6 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>gsr_by_ins_co</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>gsr_by_make</name> <name>gsr_by_make</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -31306,6 +31264,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>gsr_by_ins_co</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>gsr_labor_only</name> <name>gsr_labor_only</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

View File

@@ -967,7 +967,6 @@
}, },
"profitcenter_labor": "Profit Center: Labor", "profitcenter_labor": "Profit Center: Labor",
"profitcenter_part": "Profit Center: Part", "profitcenter_part": "Profit Center: Part",
"prt_dsmk_p": "Line Markup %",
"status": "Status", "status": "Status",
"total": "Total", "total": "Total",
"unq_seq": "Seq #" "unq_seq": "Seq #"
@@ -1877,10 +1876,10 @@
"gsr_by_delivery_date": "Gross Sales by Delivery Date", "gsr_by_delivery_date": "Gross Sales by Delivery Date",
"gsr_by_estimator": "Gross Sales by Estimator", "gsr_by_estimator": "Gross Sales by Estimator",
"gsr_by_exported_date": "Gross Sales by Export Date", "gsr_by_exported_date": "Gross Sales by Export Date",
"gsr_by_ins_co": "Gross Sales by Insurance Company'",
"gsr_by_make": "Gross Sales by Vehicle Make", "gsr_by_make": "Gross Sales by Vehicle Make",
"gsr_by_referral": "Gross Sales by Referral Source", "gsr_by_referral": "Gross Sales by Referral Source",
"gsr_by_ro": "Gross Sales by RO", "gsr_by_ro": "Gross Sales by RO",
"gsr_by_ins_co": "Gross Sales by Insurance Company'",
"gsr_labor_only": "Gross Sales - Labor Only", "gsr_labor_only": "Gross Sales - Labor Only",
"hours_sold_detail_closed": "Hours Sold Detail - Closed", "hours_sold_detail_closed": "Hours Sold Detail - Closed",
"hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source", "hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",

View File

@@ -967,7 +967,6 @@
}, },
"profitcenter_labor": "", "profitcenter_labor": "",
"profitcenter_part": "", "profitcenter_part": "",
"prt_dsmk_p": "",
"status": "Estado", "status": "Estado",
"total": "", "total": "",
"unq_seq": "Seq #" "unq_seq": "Seq #"
@@ -1877,10 +1876,10 @@
"gsr_by_delivery_date": "", "gsr_by_delivery_date": "",
"gsr_by_estimator": "", "gsr_by_estimator": "",
"gsr_by_exported_date": "", "gsr_by_exported_date": "",
"gsr_by_ins_co": "",
"gsr_by_make": "", "gsr_by_make": "",
"gsr_by_referral": "", "gsr_by_referral": "",
"gsr_by_ro": "", "gsr_by_ro": "",
"gsr_by_ins_co": "",
"gsr_labor_only": "", "gsr_labor_only": "",
"hours_sold_detail_closed": "", "hours_sold_detail_closed": "",
"hours_sold_detail_closed_ins_co": "", "hours_sold_detail_closed_ins_co": "",

View File

@@ -967,7 +967,6 @@
}, },
"profitcenter_labor": "", "profitcenter_labor": "",
"profitcenter_part": "", "profitcenter_part": "",
"prt_dsmk_p": "",
"status": "Statut", "status": "Statut",
"total": "", "total": "",
"unq_seq": "Seq #" "unq_seq": "Seq #"
@@ -1877,10 +1876,10 @@
"gsr_by_delivery_date": "", "gsr_by_delivery_date": "",
"gsr_by_estimator": "", "gsr_by_estimator": "",
"gsr_by_exported_date": "", "gsr_by_exported_date": "",
"gsr_by_ins_co": "",
"gsr_by_make": "", "gsr_by_make": "",
"gsr_by_referral": "", "gsr_by_referral": "",
"gsr_by_ro": "", "gsr_by_ro": "",
"gsr_by_ins_co": "",
"gsr_labor_only": "", "gsr_labor_only": "",
"hours_sold_detail_closed": "", "hours_sold_detail_closed": "",
"hours_sold_detail_closed_ins_co": "", "hours_sold_detail_closed_ins_co": "",