diff --git a/client/client/src/descriptor/descriptor.html b/client/client/src/descriptor/descriptor.html index 7e76550df..54e47396f 100644 --- a/client/client/src/descriptor/descriptor.html +++ b/client/client/src/descriptor/descriptor.html @@ -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}"> { 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'), diff --git a/services/db/install/changes/1.0.5/12-ACL.sql b/services/db/install/changes/1.0.5/12-ACL.sql index f3885c01f..cbcbe0b0a 100644 --- a/services/db/install/changes/1.0.5/12-ACL.sql +++ b/services/db/install/changes/1.0.5/12-ACL.sql @@ -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'; \ No newline at end of file diff --git a/services/db/install/changes/1.0.5/sale.sql b/services/db/install/changes/1.0.5/13-sale.sql similarity index 100% rename from services/db/install/changes/1.0.5/sale.sql rename to services/db/install/changes/1.0.5/13-sale.sql diff --git a/services/db/install/changes/1.0.5/componentTypeRate.sql b/services/db/install/changes/1.0.5/14-componentTypeRate.sql similarity index 100% rename from services/db/install/changes/1.0.5/componentTypeRate.sql rename to services/db/install/changes/1.0.5/14-componentTypeRate.sql diff --git a/services/db/install/changes/1.0.5/15-dropViewSalix.sql b/services/db/install/changes/1.0.5/15-dropViewSalix.sql new file mode 100644 index 000000000..c0d4810fb --- /dev/null +++ b/services/db/install/changes/1.0.5/15-dropViewSalix.sql @@ -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`; \ No newline at end of file diff --git a/services/db/install/changes/1.0.5/ticketListCreate.sql b/services/db/install/changes/1.0.5/ticketListCreate.sql new file mode 100644 index 000000000..bb72a1cfb --- /dev/null +++ b/services/db/install/changes/1.0.5/ticketListCreate.sql @@ -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 ; \ No newline at end of file