This commit is contained in:
@@ -29,7 +29,14 @@ todo: actual customer reports so can figure out datalist for bringing other name
|
||||
|
||||
|
||||
|
||||
CURRENTLY DOING: update front and back end stuff
|
||||
CURRENTLY DOING: Rate
|
||||
Split into laborrate and travelrate
|
||||
Needs multiple locale keys?
|
||||
actually just for the list and the object name, the rest is the same really
|
||||
import
|
||||
split out labor/service rates
|
||||
unitchargedescription now just text field so import accordingly
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -71,12 +78,10 @@ EACH OBJECT DEV CYCLE:
|
||||
## OBJECT ORDER
|
||||
Preliminary order to get the ball rolling, these are the easiest starting point:
|
||||
|
||||
|
||||
|
||||
Rate
|
||||
TaxCode (really don't see any changes, but surely there would be?? Think this one over)
|
||||
|
||||
ServiceBank
|
||||
(note, see cases, has changed, affects client, ho, unit)
|
||||
TaxCode (really don't see any changes, but surely there would be?? Think this one over)
|
||||
Unit
|
||||
see cases 3536,
|
||||
UnitModel
|
||||
@@ -92,6 +97,7 @@ Preliminary order to get the ball rolling, these are the easiest starting point:
|
||||
When do this need to go back and do a bunch of //MIGRATE_OUTSTANDING
|
||||
i.e. show all
|
||||
todo: Consider adding latitude / longitude to wo, quote, pm objects
|
||||
rate split
|
||||
can copy over from the unit or customer or set themselves
|
||||
and can always hide
|
||||
means wo could be scheduled for ad-hoc locations and serviced that way, i.e. a truck parked on the side of the highway etc
|
||||
|
||||
@@ -455,8 +455,6 @@ function initNavPanel() {
|
||||
}
|
||||
|
||||
//****************** ACCOUNTING
|
||||
//TODO: NO specific objects yet to check rights for so keeping this as originally written until we get there
|
||||
//Not sure what this is exactly, probably to do with integration
|
||||
if (
|
||||
window.$gz.role.hasRole([
|
||||
role.BizAdminFull,
|
||||
@@ -466,23 +464,23 @@ function initNavPanel() {
|
||||
) {
|
||||
sub = [];
|
||||
|
||||
//FAKE subitem as is still TBD
|
||||
//RATES
|
||||
sub.push({
|
||||
title: "Accounting",
|
||||
title: "RateList",
|
||||
icon: "$ayiCalculator",
|
||||
route: "/acc-accounting",
|
||||
key: key++
|
||||
});
|
||||
|
||||
sub.push({
|
||||
title: "TaxCodeList",
|
||||
icon: "$ayiPercent",
|
||||
route: "/acc-accounting",
|
||||
key: key++
|
||||
});
|
||||
|
||||
// ** ACCOUNTING (TOP)
|
||||
addNavItem(
|
||||
"Accounting",
|
||||
"$ayiCalculator",
|
||||
undefined,
|
||||
sub,
|
||||
key++,
|
||||
"accounting"
|
||||
);
|
||||
addNavItem("Accounting", "$ayiCoins", undefined, sub, key++, "accounting");
|
||||
}
|
||||
|
||||
//############# ADMINISTRATION
|
||||
|
||||
@@ -167,6 +167,8 @@ export default {
|
||||
"ReminderList",
|
||||
"Inventory",
|
||||
"Accounting",
|
||||
"TaxCodeList",
|
||||
"RateList",
|
||||
"Administration",
|
||||
"Operations",
|
||||
"Attachments",
|
||||
|
||||
@@ -51,6 +51,7 @@ import {
|
||||
faClone,
|
||||
faCode,
|
||||
faCogs,
|
||||
faCoins,
|
||||
faColumns,
|
||||
faCommentAlt,
|
||||
faConciergeBell,
|
||||
@@ -124,6 +125,7 @@ import {
|
||||
faPencilAlt,
|
||||
faPencilRuler,
|
||||
faPeopleCarry,
|
||||
faPercent,
|
||||
faPhoneAlt,
|
||||
faPlug,
|
||||
faPlus,
|
||||
@@ -217,6 +219,7 @@ library.add(
|
||||
faClone,
|
||||
faCode,
|
||||
faCogs,
|
||||
faCoins,
|
||||
faColumns,
|
||||
faCommentAlt,
|
||||
faConciergeBell,
|
||||
@@ -291,6 +294,7 @@ library.add(
|
||||
faPencilAlt,
|
||||
faPencilRuler,
|
||||
faPeopleCarry,
|
||||
faPercent,
|
||||
faPhoneAlt,
|
||||
faPlug,
|
||||
faPlus,
|
||||
@@ -503,6 +507,12 @@ const CUSTOM_ICONS = {
|
||||
icon: ["fas", "cogs"]
|
||||
}
|
||||
},
|
||||
ayiCoins: {
|
||||
component: FontAwesomeIcon,
|
||||
props: {
|
||||
icon: ["fas", "coins"]
|
||||
}
|
||||
},
|
||||
ayiColumns: {
|
||||
component: FontAwesomeIcon,
|
||||
props: {
|
||||
@@ -935,6 +945,12 @@ const CUSTOM_ICONS = {
|
||||
icon: ["fas", "people-carry"]
|
||||
}
|
||||
},
|
||||
ayiPercent: {
|
||||
component: FontAwesomeIcon,
|
||||
props: {
|
||||
icon: ["fas", "percent"]
|
||||
}
|
||||
},
|
||||
ayiPhoneAlt: {
|
||||
component: FontAwesomeIcon,
|
||||
props: {
|
||||
|
||||
Reference in New Issue
Block a user