3384-item_basic-data add field genericFk #807
|
|
@ -23,321 +23,376 @@
|
|||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.icon-preserved:before {
|
||||
content: "\e963";
|
||||
}
|
||||
.icon-treatments:before {
|
||||
content: "\e964";
|
||||
}
|
||||
.icon-funeral:before {
|
||||
content: "\e965";
|
||||
}
|
||||
.icon-handmadeArtificial:before {
|
||||
content: "\e966";
|
||||
}
|
||||
.icon-fixedPrice:before {
|
||||
content: "\e962";
|
||||
}
|
||||
.icon-accounts:before {
|
||||
content: "\e95f";
|
||||
}
|
||||
.icon-clientConsumption:before {
|
||||
content: "\e960";
|
||||
}
|
||||
.icon-lastBuy:before {
|
||||
content: "\e961";
|
||||
}
|
||||
.icon-zone:before {
|
||||
content: "\e95d";
|
||||
}
|
||||
.icon-inventory:before {
|
||||
content: "\e95e";
|
||||
}
|
||||
.icon-wiki:before {
|
||||
content: "\e968";
|
||||
}
|
||||
.icon-attach:before {
|
||||
content: "\e96c";
|
||||
}
|
||||
.icon-zone2:before {
|
||||
content: "\e96d";
|
||||
}
|
||||
.icon-net:before {
|
||||
content: "\e95b";
|
||||
}
|
||||
.icon-anonymous:before {
|
||||
content: "\e95c";
|
||||
}
|
||||
.icon-buyrequest:before {
|
||||
content: "\e914";
|
||||
}
|
||||
.icon-entry:before {
|
||||
content: "\e959";
|
||||
}
|
||||
.icon-thermometer:before {
|
||||
content: "\e95a";
|
||||
}
|
||||
.icon-deletedTicket:before {
|
||||
content: "\e958";
|
||||
}
|
||||
.icon-fruit:before {
|
||||
content: "\e957";
|
||||
}
|
||||
.icon-deliveryprices:before {
|
||||
content: "\e956";
|
||||
}
|
||||
.icon-basketadd:before {
|
||||
content: "\e955";
|
||||
}
|
||||
.icon-catalog:before {
|
||||
content: "\e952";
|
||||
}
|
||||
.icon-agency:before {
|
||||
content: "\e910";
|
||||
}
|
||||
.icon-delivery:before {
|
||||
content: "\e94a";
|
||||
}
|
||||
.icon-wand:before {
|
||||
content: "\e954";
|
||||
}
|
||||
.icon-unavailable:before {
|
||||
content: "\e953";
|
||||
}
|
||||
.icon-buscaman:before {
|
||||
content: "\e951";
|
||||
}
|
||||
.icon-pbx:before {
|
||||
content: "\e950";
|
||||
}
|
||||
.icon-calendar:before {
|
||||
content: "\e94f";
|
||||
}
|
||||
.icon-linesplit:before {
|
||||
content: "\e945";
|
||||
}
|
||||
.icon-invoices:before {
|
||||
content: "\e91c";
|
||||
}
|
||||
.icon-pets:before {
|
||||
content: "\e94e";
|
||||
}
|
||||
.icon-100:before {
|
||||
content: "\e940";
|
||||
content: "\e976";
|
||||
}
|
||||
.icon-accessory:before {
|
||||
content: "\e90a";
|
||||
.icon-account:before {
|
||||
content: "\e900";
|
||||
color: #000;
|
||||
}
|
||||
.icon-actions:before {
|
||||
content: "\e900";
|
||||
}
|
||||
.icon-addperson:before {
|
||||
content: "\e901";
|
||||
}
|
||||
.icon-albaran:before {
|
||||
.icon-addperson:before {
|
||||
content: "\e902";
|
||||
}
|
||||
.icon-apps:before {
|
||||
content: "\e948";
|
||||
}
|
||||
.icon-artificial:before {
|
||||
.icon-agency:before {
|
||||
content: "\e903";
|
||||
}
|
||||
.icon-barcode:before {
|
||||
.icon-albaran:before {
|
||||
content: "\e904";
|
||||
}
|
||||
.icon-basket:before {
|
||||
content: "\e942";
|
||||
}
|
||||
.icon-bin:before {
|
||||
.icon-anonymous:before {
|
||||
content: "\e905";
|
||||
}
|
||||
.icon-botanical:before {
|
||||
.icon-apps:before {
|
||||
content: "\e906";
|
||||
}
|
||||
.icon-bucket:before {
|
||||
.icon-artificial:before {
|
||||
content: "\e907";
|
||||
}
|
||||
.icon-claims:before {
|
||||
.icon-attach:before {
|
||||
content: "\e908";
|
||||
}
|
||||
.icon-clone:before {
|
||||
.icon-barcode:before {
|
||||
content: "\e909";
|
||||
}
|
||||
.icon-columnadd:before {
|
||||
content: "\e944";
|
||||
.icon-basket:before {
|
||||
content: "\e90a";
|
||||
}
|
||||
.icon-columndelete:before {
|
||||
content: "\e90f";
|
||||
}
|
||||
.icon-components:before {
|
||||
.icon-basketadd:before {
|
||||
content: "\e90b";
|
||||
}
|
||||
.icon-consignatarios:before {
|
||||
content: "\e90d";
|
||||
}
|
||||
.icon-control:before {
|
||||
content: "\e93f";
|
||||
}
|
||||
.icon-credit:before {
|
||||
content: "\e90e";
|
||||
}
|
||||
.icon-details:before {
|
||||
content: "\e911";
|
||||
}
|
||||
.icon-disabled:before {
|
||||
content: "\e91b";
|
||||
}
|
||||
.icon-doc:before {
|
||||
content: "\e913";
|
||||
}
|
||||
.icon-exit:before {
|
||||
content: "\e947";
|
||||
}
|
||||
.icon-eye:before {
|
||||
content: "\e915";
|
||||
}
|
||||
.icon-fiscal:before {
|
||||
content: "\e912";
|
||||
}
|
||||
.icon-flower:before {
|
||||
content: "\e916";
|
||||
}
|
||||
.icon-frozen:before {
|
||||
content: "\e917";
|
||||
}
|
||||
.icon-greenery:before {
|
||||
content: "\e93c";
|
||||
}
|
||||
.icon-greuge:before {
|
||||
content: "\e918";
|
||||
}
|
||||
.icon-grid:before {
|
||||
content: "\e919";
|
||||
}
|
||||
.icon-handmade:before {
|
||||
.icon-bin:before {
|
||||
content: "\e90c";
|
||||
}
|
||||
.icon-history:before {
|
||||
.icon-botanical:before {
|
||||
content: "\e90d";
|
||||
}
|
||||
.icon-bucket:before {
|
||||
content: "\e90e";
|
||||
color: #5f5f5f;
|
||||
}
|
||||
.icon-buscaman:before {
|
||||
content: "\e90f";
|
||||
}
|
||||
.icon-buyrequest:before {
|
||||
content: "\e910";
|
||||
}
|
||||
.icon-calc_volum .path1:before {
|
||||
content: "\e911";
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path2:before {
|
||||
content: "\e912";
|
||||
margin-left: -1em;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path3:before {
|
||||
content: "\e913";
|
||||
margin-left: -1em;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path4:before {
|
||||
content: "\e914";
|
||||
margin-left: -1em;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path5:before {
|
||||
content: "\e915";
|
||||
margin-left: -1em;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path6:before {
|
||||
content: "\e916";
|
||||
margin-left: -1em;
|
||||
color: rgb(255, 255, 255);
|
||||
}
|
||||
.icon-calendar:before {
|
||||
content: "\e917";
|
||||
}
|
||||
.icon-catalog:before {
|
||||
content: "\e918";
|
||||
}
|
||||
.icon-claims:before {
|
||||
content: "\e919";
|
||||
}
|
||||
.icon-client:before {
|
||||
content: "\e91a";
|
||||
}
|
||||
.icon-info:before {
|
||||
content: "\e949";
|
||||
.icon-clone:before {
|
||||
content: "\e91b";
|
||||
}
|
||||
.icon-item:before {
|
||||
content: "\e941";
|
||||
.icon-columnadd:before {
|
||||
content: "\e91c";
|
||||
}
|
||||
.icon-languaje:before {
|
||||
.icon-columndelete:before {
|
||||
content: "\e91d";
|
||||
}
|
||||
.icon-linedelete:before {
|
||||
content: "\e946";
|
||||
}
|
||||
.icon-lines:before {
|
||||
.icon-complementos:before {
|
||||
content: "\e91e";
|
||||
}
|
||||
.icon-linesprepaired:before {
|
||||
content: "\e94b";
|
||||
}
|
||||
.icon-logout:before {
|
||||
.icon-components:before {
|
||||
content: "\e91f";
|
||||
}
|
||||
.icon-mana:before {
|
||||
.icon-confeccion:before {
|
||||
content: "\e920";
|
||||
}
|
||||
.icon-mandatory:before {
|
||||
.icon-consignatarios:before {
|
||||
content: "\e921";
|
||||
}
|
||||
.icon-niche:before {
|
||||
.icon-control:before {
|
||||
content: "\e922";
|
||||
}
|
||||
.icon-no036:before {
|
||||
.icon-credit:before {
|
||||
content: "\e923";
|
||||
}
|
||||
.icon-notes:before {
|
||||
.icon-deletedTicketCross:before {
|
||||
content: "\e924";
|
||||
}
|
||||
.icon-noweb:before {
|
||||
.icon-deleteline:before {
|
||||
content: "\e925";
|
||||
}
|
||||
.icon-onlinepayment:before {
|
||||
.icon-delivery:before {
|
||||
content: "\e926";
|
||||
}
|
||||
.icon-package:before {
|
||||
.icon-deliveryprices:before {
|
||||
content: "\e927";
|
||||
}
|
||||
.icon-payment:before {
|
||||
.icon-details:before {
|
||||
content: "\e928";
|
||||
}
|
||||
.icon-person:before {
|
||||
.icon-dfiscales:before {
|
||||
content: "\e929";
|
||||
}
|
||||
.icon-photo:before {
|
||||
.icon-doc:before {
|
||||
content: "\e92a";
|
||||
}
|
||||
.icon-plant:before {
|
||||
.icon-entry:before {
|
||||
content: "\e92b";
|
||||
}
|
||||
.icon-recovery:before {
|
||||
content: "\e92d";
|
||||
}
|
||||
.icon-regentry:before {
|
||||
content: "\e92e";
|
||||
}
|
||||
.icon-reserve:before {
|
||||
content: "\e92f";
|
||||
}
|
||||
.icon-revision:before {
|
||||
content: "\e94c";
|
||||
}
|
||||
.icon-risk:before {
|
||||
content: "\e930";
|
||||
}
|
||||
.icon-services:before {
|
||||
content: "\e94d";
|
||||
}
|
||||
.icon-settings:before {
|
||||
content: "\e931";
|
||||
}
|
||||
.icon-sms:before {
|
||||
content: "\e932";
|
||||
}
|
||||
.icon-solclaim:before {
|
||||
content: "\e933";
|
||||
}
|
||||
.icon-solunion:before {
|
||||
content: "\e934";
|
||||
}
|
||||
.icon-splur:before {
|
||||
content: "\e935";
|
||||
}
|
||||
.icon-stowaway:before {
|
||||
.icon-exit:before {
|
||||
content: "\e92c";
|
||||
}
|
||||
.icon-supplier:before {
|
||||
.icon-eye:before {
|
||||
content: "\e92d";
|
||||
}
|
||||
.icon-fixedPrice:before {
|
||||
content: "\e92e";
|
||||
}
|
||||
.icon-flor:before {
|
||||
content: "\e92f";
|
||||
}
|
||||
.icon-frozen:before {
|
||||
content: "\e930";
|
||||
}
|
||||
.icon-fruit:before {
|
||||
content: "\e931";
|
||||
}
|
||||
.icon-funeral:before {
|
||||
content: "\e932";
|
||||
}
|
||||
.icon-greuge:before {
|
||||
content: "\e933";
|
||||
}
|
||||
.icon-grid:before {
|
||||
content: "\e934";
|
||||
}
|
||||
.icon-handmadeArtificial:before {
|
||||
content: "\e935";
|
||||
}
|
||||
.icon-headercol:before {
|
||||
content: "\e936";
|
||||
}
|
||||
.icon-tags:before {
|
||||
.icon-History:before {
|
||||
content: "\e937";
|
||||
}
|
||||
.icon-tax:before {
|
||||
.icon-Inactivo:before {
|
||||
content: "\e938";
|
||||
}
|
||||
.icon-ticket:before {
|
||||
.icon-info:before {
|
||||
content: "\e939";
|
||||
}
|
||||
.icon-traceability:before {
|
||||
.icon-inventory:before {
|
||||
content: "\e93a";
|
||||
}
|
||||
.icon-transaction:before {
|
||||
.icon-invoice:before {
|
||||
content: "\e93b";
|
||||
}
|
||||
.icon-volume:before {
|
||||
.icon-invoiceIn:before {
|
||||
content: "\e93c";
|
||||
}
|
||||
.icon-invoice-in-create:before {
|
||||
content: "\e93d";
|
||||
}
|
||||
.icon-web:before {
|
||||
.icon-invoiceOut:before {
|
||||
content: "\e93e";
|
||||
}
|
||||
.icon-worker:before {
|
||||
.icon-item:before {
|
||||
content: "\e93f";
|
||||
}
|
||||
.icon-languaje:before {
|
||||
content: "\e940";
|
||||
}
|
||||
.icon-lineas:before {
|
||||
content: "\e941";
|
||||
}
|
||||
.icon-linesprepaired:before {
|
||||
content: "\e942";
|
||||
}
|
||||
.icon-logout:before {
|
||||
content: "\e943";
|
||||
}
|
||||
}
|
||||
.icon-mana:before {
|
||||
content: "\e944";
|
||||
}
|
||||
.icon-mandatory:before {
|
||||
content: "\e945";
|
||||
}
|
||||
.icon-net:before {
|
||||
content: "\e946";
|
||||
}
|
||||
.icon-niche:before {
|
||||
content: "\e947";
|
||||
}
|
||||
.icon-no036:before {
|
||||
content: "\e948";
|
||||
}
|
||||
.icon-notes:before {
|
||||
content: "\e949";
|
||||
}
|
||||
.icon-noweb:before {
|
||||
content: "\e94a";
|
||||
}
|
||||
.icon-onlinepayment:before {
|
||||
content: "\e94b";
|
||||
}
|
||||
.icon-package:before {
|
||||
content: "\e94c";
|
||||
}
|
||||
.icon-payment:before {
|
||||
content: "\e94d";
|
||||
}
|
||||
.icon-pbx:before {
|
||||
content: "\e94e";
|
||||
}
|
||||
.icon-Person:before {
|
||||
content: "\e94f";
|
||||
}
|
||||
.icon-pets:before {
|
||||
content: "\e950";
|
||||
}
|
||||
.icon-photo:before {
|
||||
content: "\e951";
|
||||
}
|
||||
.icon-planta:before {
|
||||
content: "\e952";
|
||||
}
|
||||
.icon-stowaway:before {
|
||||
content: "\e953";
|
||||
}
|
||||
.icon-preserved:before {
|
||||
content: "\e954";
|
||||
}
|
||||
.icon-recovery:before {
|
||||
content: "\e955";
|
||||
}
|
||||
.icon-regentry:before {
|
||||
content: "\e956";
|
||||
}
|
||||
.icon-reserva:before {
|
||||
content: "\e957";
|
||||
}
|
||||
.icon-revision:before {
|
||||
content: "\e958";
|
||||
}
|
||||
.icon-riesgo:before {
|
||||
content: "\e959";
|
||||
}
|
||||
.icon-services:before {
|
||||
content: "\e95a";
|
||||
}
|
||||
.icon-settings:before {
|
||||
content: "\e95b";
|
||||
}
|
||||
.icon-shipment-01 .path1:before {
|
||||
content: "\e95c";
|
||||
color: rgb(225, 225, 225);
|
||||
}
|
||||
.icon-shipment-01 .path2:before {
|
||||
content: "\e95d";
|
||||
margin-left: -1em;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-sign:before {
|
||||
content: "\e95e";
|
||||
}
|
||||
.icon-sms:before {
|
||||
content: "\e95f";
|
||||
}
|
||||
.icon-solclaim:before {
|
||||
content: "\e960";
|
||||
}
|
||||
.icon-solunion:before {
|
||||
content: "\e961";
|
||||
}
|
||||
.icon-splitline:before {
|
||||
content: "\e962";
|
||||
}
|
||||
.icon-splur:before {
|
||||
content: "\e963";
|
||||
}
|
||||
.icon-stowaway-2:before {
|
||||
content: "\e964";
|
||||
}
|
||||
.icon-supplier:before {
|
||||
content: "\e965";
|
||||
}
|
||||
.icon-supplierfalse:before {
|
||||
content: "\e966";
|
||||
}
|
||||
.icon-tags:before {
|
||||
content: "\e967";
|
||||
}
|
||||
.icon-tax:before {
|
||||
content: "\e968";
|
||||
}
|
||||
.icon-thermometer:before {
|
||||
content: "\e969";
|
||||
}
|
||||
.icon-ticket:before {
|
||||
content: "\e96a";
|
||||
}
|
||||
.icon-traceability:before {
|
||||
content: "\e96b";
|
||||
}
|
||||
.icon-transaction:before {
|
||||
content: "\e96c";
|
||||
}
|
||||
.icon-treatments:before {
|
||||
content: "\e96d";
|
||||
}
|
||||
.icon-unavailable:before {
|
||||
content: "\e96e";
|
||||
}
|
||||
.icon-verde:before {
|
||||
content: "\e96f";
|
||||
}
|
||||
.icon-volume:before {
|
||||
content: "\e970";
|
||||
}
|
||||
.icon-wand:before {
|
||||
content: "\e971";
|
||||
}
|
||||
.icon-web:before {
|
||||
content: "\e972";
|
||||
}
|
||||
.icon-wiki:before {
|
||||
content: "\e973";
|
||||
}
|
||||
.icon-worker:before {
|
||||
content: "\e974";
|
||||
}
|
||||
.icon-zone:before {
|
||||
content: "\e975";
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 147 KiB |
Binary file not shown.
Binary file not shown.
|
|
@ -3,7 +3,7 @@
|
|||
url="Tickets"
|
||||
link="{clientFk: $ctrl.client.id}"
|
||||
filter="::$ctrl.ticketFilter"
|
||||
limit="5"
|
||||
limit="10"
|
||||
data="tickets"
|
||||
order="shipped DESC, id">
|
||||
</vn-crud-model>
|
||||
|
|
@ -287,7 +287,7 @@
|
|||
<vn-horizontal>
|
||||
<vn-one>
|
||||
<h4 translate>Latest tickets</h4>
|
||||
<vn-table model="ticketsModel" class="scrollable sm">
|
||||
<vn-table model="ticketsModel">
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
<vn-th field="id" number>Id</vn-th>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"module": "invoiceOut",
|
||||
"name": "Invoices out",
|
||||
"icon": "icon-invoices",
|
||||
"icon": "icon-invoiceOut",
|
||||
"validations" : true,
|
||||
"dependencies": ["worker", "client", "ticket"],
|
||||
"menus": {
|
||||
"main": [
|
||||
{"state": "invoiceOut.index", "icon": "icon-invoices"}
|
||||
{"state": "invoiceOut.index", "icon": "icon-invoiceOut"}
|
||||
]
|
||||
},
|
||||
"routes": [
|
||||
|
|
|
|||
|
|
@ -121,11 +121,17 @@
|
|||
data="$ctrl.possibleTickets">
|
||||
</vn-crud-model>
|
||||
<vn-dialog
|
||||
vn-id="possibleTicketsDialog"
|
||||
on-accept="$ctrl.setTicketsRoute()"
|
||||
message="Tickets to add">
|
||||
vn-id="possibleTicketsDialog">
|
||||
<tpl-title>
|
||||
<vn-horizontal>
|
||||
<span translate>Tickets to add</span>
|
||||
<div class="button-right">
|
||||
<vn-button label="Add" ng-click="$ctrl.setTicketsRoute()"></vn-button>
|
||||
</div>
|
||||
</vn-horizontal>
|
||||
</tpl-title>
|
||||
<tpl-body>
|
||||
<vn-data-viewer class="vn-pa-md" model="possibleTicketsModel">
|
||||
<vn-data-viewer model="possibleTicketsModel">
|
||||
<vn-table model="possibleTicketsModel" auto-load="false">
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
|
|
@ -154,7 +160,7 @@
|
|||
{{::ticket.id}}
|
||||
</span>
|
||||
</vn-td>
|
||||
<vn-td number>
|
||||
<vn-td expand>
|
||||
<span class="link" ng-click="clientDescriptor.show($event, ticket.clientFk)">
|
||||
{{::ticket.nickname}}
|
||||
</span>
|
||||
|
|
@ -168,10 +174,6 @@
|
|||
</vn-table>
|
||||
</vn-data-viewer>
|
||||
</tpl-body>
|
||||
<tpl-buttons>
|
||||
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
|
||||
<button response="accept" translate>Add</button>
|
||||
</tpl-buttons>
|
||||
</vn-dialog>
|
||||
<vn-float-button
|
||||
icon="add"
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@ class Controller extends Section {
|
|||
this.$.model.data = this.$.model.data.concat(tickets);
|
||||
this.vnApp.showSuccess(this.$t('Data saved!'));
|
||||
this.updateVolume();
|
||||
this.$.possibleTicketsDialog.hide();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -197,6 +197,9 @@ describe('Route', () => {
|
|||
|
||||
describe('setTicketsRoute()', () => {
|
||||
it('should perform a POST query to add tickets to the route', () => {
|
||||
controller.$.possibleTicketsDialog = {hide: () => {}};
|
||||
jest.spyOn(controller.$.possibleTicketsDialog, 'hide');
|
||||
|
||||
controller.$params = {id: 1101};
|
||||
controller.$.model.data = [{id: 1, checked: false}];
|
||||
|
||||
|
|
@ -223,6 +226,7 @@ describe('Route', () => {
|
|||
$httpBackend.flush();
|
||||
|
||||
expect(controller.$.model.data).toEqual(expectedResult);
|
||||
expect(controller.$.possibleTicketsDialog.hide).toHaveBeenCalledWith();
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -7,4 +7,10 @@ vn-route-tickets form{
|
|||
.order-field {
|
||||
max-width: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.button-right{
|
||||
display: block;
|
||||
padding-right: 50px;
|
||||
text-align: right;
|
||||
}
|
||||
Loading…
Reference in New Issue