verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
gerard 2018-05-21 11:48:50 +02:00
parent e118798c69 88cf75e088
commit 7f54bcb019
7 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client/src/descriptor/descriptor.html
View File

@ -49,7 +49,7 @@
vn-tooltip="Client has debt"
tooltip-position = "right"
icon="icon-risk"
ng-class="{bright: $ctrl.clientDebt < 0}">
ng-class="{bright: $ctrl.clientDebt > 0}">
</vn-icon>
<vn-icon
vn-tooltip="Client not checked"

6
client/core/src/components/auto-paging/auto-paging.js
View File

@ -2,13 +2,14 @@ import ngModule from '../../module';
import getWatchers from '../../lib/get-watchers';
class AutoPaging {
constructor($http, $window, $element, $timeout, vnApp, $translate) {
constructor($http, $window, $element, $timeout, vnApp, $translate, $scope) {
this.$http = $http;
this.$window = $window;
this.$element = $element;
this.$timeout = $timeout;
this.vnApp = vnApp;
this.$translate = $translate;
this.$scope = $scope;
this.numPerPage = null;
this.maxItems = 0;
@ -31,6 +32,7 @@ class AutoPaging {
res.instances.forEach(item => {
this.items.push(item);
});
this.$scope.$apply();
this.checkWatchers();
});
if (this.index.filter.page == this.numPages) {
@ -108,7 +110,7 @@ class AutoPaging {
}
}
AutoPaging.$inject = ['$http', '$window', '$element', '$timeout', 'vnApp', '$translate'];
AutoPaging.$inject = ['$http', '$window', '$element', '$timeout', 'vnApp', '$translate', '$scope'];
ngModule.component('vnAutoPaging', {
template: require('./auto-paging.html'),

5
services/db/install/changes/1.0.5/12-ACL.sql
View File

@ -3,3 +3,8 @@ UPDATE `salix`.`ACL` SET `principalId`='production' WHERE `id`='67';
INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('78', 'TicketTracking', '*', 'WRITE', 'ALLOW', 'ROLE', 'production');
INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `permission`, `principalType`, `principalId`) VALUES ('79', 'TicketTracking', 'changeState', 'ALLOW', 'ROLE', 'employe');
UPDATE `salix`.`ACL` SET `accessType`='READ' WHERE `id`='65';
INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('80', 'Sale', 'removes', '*', 'ALLOW', 'ROLE', 'employee');
INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('81', 'Sale', 'moveToTicket', '*', 'ALLOW', 'ROLE', 'employee');
UPDATE `salix`.`ACL` SET `principalId`='employee' WHERE `id`='79';
UPDATE `salix`.`ACL` SET `accessType`='*' WHERE `id`='79';

0
services/db/install/changes/1.0.5/sale.sql → services/db/install/changes/1.0.5/13-sale.sql
View File

0
services/db/install/changes/1.0.5/componentTypeRate.sql → services/db/install/changes/1.0.5/14-componentTypeRate.sql
View File

27
services/db/install/changes/1.0.5/15-dropViewSalix.sql Normal file
View File

@ -0,0 +1,27 @@
DROP VIEW `salix`.`Accounting`;
DROP VIEW `salix`.`Address`;
DROP VIEW `salix`.`Agency`;
DROP VIEW `salix`.`AgencyMode`;
DROP VIEW `salix`.`Bank`;
DROP VIEW `salix`.`City`;
DROP VIEW `salix`.`Client`;
DROP VIEW `salix`.`ClientCredit`;
DROP VIEW `salix`.`ClientCreditLimit`;
DROP VIEW `salix`.`ClientObservation`;
DROP VIEW `salix`.`ClientType`;
DROP VIEW `salix`.`ContactChannel`;
DROP VIEW `salix`.`Country`;
DROP VIEW `salix`.`CreditClassification`;
DROP VIEW `salix`.`Delivery`;
DROP VIEW `salix`.`Employee`;
DROP VIEW `salix`.`PayMethod`;
DROP VIEW `salix`.`Province`;
DROP VIEW `salix`.`Route`;
DROP VIEW `salix`.`State`;
DROP VIEW `salix`.`Ticket`;
DROP VIEW `salix`.`TicketState`;
DROP VIEW `salix`.`Vehicle`;
DROP VIEW `salix`.`Warehouse`;
DROP VIEW `salix`.`WarehouseAlias`;
DROP VIEW `salix`.`Worker`;
DROP VIEW `salix`.`Zone`;

23
services/db/install/changes/1.0.5/ticketListCreate.sql Normal file
View File

@ -0,0 +1,23 @@
USE `vn`;
DROP procedure IF EXISTS `ticketListCreate`;
DELIMITER $$
USE `vn`$$
CREATE DEFINER=`root`@`%` PROCEDURE `ticketListCreate`(
vClientId INT
,vShipped DATE
,vWarehouseId INT
,vCompanyFk INT
,vAddressFk INT
,vAgencyType INT
,vRouteFk INT
,vlanded DATE)
BEGIN
DECLARE vNewTicket INT;
CALL vn.ticketCreate(vClientId, vShipped, vWarehouseId, vCompanyFk, vAddressFk, vAgencyType, vRouteFk, vlanded,vNewTicket);
SELECT vNewTicket;
END$$
DELIMITER ;