diff --git a/db/changes/10440-fallas/00-aclIntrastat.sql b/db/changes/10440-fallas/00-aclIntrastat.sql
new file mode 100644
index 000000000..16410814d
--- /dev/null
+++ b/db/changes/10440-fallas/00-aclIntrastat.sql
@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL`
+(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+VALUES('InvoiceInIntrastat', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-invoiceInIntrastat.sql b/db/changes/10440-fallas/00-invoiceInIntrastat.sql
new file mode 100644
index 000000000..8f65fac29
--- /dev/null
+++ b/db/changes/10440-fallas/00-invoiceInIntrastat.sql
@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
+ VALUES ('InvoiceInIntrastat','*','*','ALLOW','ROLE','employee');
\ No newline at end of file
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 5bd89ebd2..0802a980c 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -2428,6 +2428,13 @@ INSERT INTO `vn`.`invoiceInTax` (`invoiceInFk`, `taxableBase`, `expenceFk`, `for
(6, 29.95, '7001000000', NULL, 7, 20),
(7, 58.64, '6210000567', NULL, 8, 20);
+INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amount`, `stems`, `countryFk`)
+ VALUES
+ (1, 30.50, 5080000, 10.00, 162, 5),
+ (1, 10, 6021010, 20.00, 205, 5),
+ (2, 13.20, 5080000, 15.00, 580, 5),
+ (2, 16.10, 6021010, 25.00, 80, 5);
+
INSERT INTO `vn`.`ticketRecalc`(`ticketFk`)
SELECT `id`
FROM `vn`.`ticket` t
diff --git a/modules/invoiceIn/back/methods/invoice-in/summary.js b/modules/invoiceIn/back/methods/invoice-in/summary.js
index acabe29d9..0e55eeaac 100644
--- a/modules/invoiceIn/back/methods/invoice-in/summary.js
+++ b/modules/invoiceIn/back/methods/invoice-in/summary.js
@@ -64,6 +64,34 @@ module.exports = Self => {
}]
}
},
+ {
+ relation: 'invoiceInIntrastat',
+ scope: {
+ fields: [
+ 'id',
+ 'invoiceInFk',
+ 'net',
+ 'intrastatFk',
+ 'amount',
+ 'stems',
+ 'countryFk',
+ 'statisticalValue'],
+ include: [{
+ relation: 'intrastat',
+ scope: {
+ fields: [
+ 'id',
+ 'description']
+ }
+ },
+ {
+ relation: 'country',
+ scope: {
+ fields: ['code']
+ }
+ }]
+ }
+ },
{
relation: 'invoiceInTax',
scope: {
diff --git a/modules/invoiceIn/back/model-config.json b/modules/invoiceIn/back/model-config.json
index f0745f53b..6765ae81c 100644
--- a/modules/invoiceIn/back/model-config.json
+++ b/modules/invoiceIn/back/model-config.json
@@ -8,6 +8,9 @@
"InvoiceInDueDay": {
"dataSource": "vn"
},
+ "InvoiceInIntrastat": {
+ "dataSource": "vn"
+ },
"InvoiceInLog": {
"dataSource": "vn"
}
diff --git a/modules/invoiceIn/back/models/invoice-in-intrastat.json b/modules/invoiceIn/back/models/invoice-in-intrastat.json
new file mode 100644
index 000000000..65ab1f36a
--- /dev/null
+++ b/modules/invoiceIn/back/models/invoice-in-intrastat.json
@@ -0,0 +1,50 @@
+{
+ "name": "InvoiceInIntrastat",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "invoiceInIntrastat"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "invoiceInFk": {
+ "type": "number"
+ },
+ "net": {
+ "type": "number"
+ },
+ "intrastatFk": {
+ "type": "number"
+ },
+ "amount": {
+ "type": "number"
+ },
+ "stems": {
+ "type": "number"
+ },
+ "countryFk": {
+ "type": "number"
+ },
+ "statisticalValue": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "intrastat": {
+ "type": "belongsTo",
+ "model": "Intrastat",
+ "foreignKey": "intrastatFk"
+ },
+ "country": {
+ "type": "belongsTo",
+ "model": "Country",
+ "foreignKey": "countryFk"
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/invoiceIn/back/models/invoice-in.json b/modules/invoiceIn/back/models/invoice-in.json
index feb2d9aec..c6a736b06 100644
--- a/modules/invoiceIn/back/models/invoice-in.json
+++ b/modules/invoiceIn/back/models/invoice-in.json
@@ -64,6 +64,11 @@
"model": "InvoiceInDueDay",
"foreignKey": "invoiceInFk"
},
+ "invoiceInIntrastat": {
+ "type": "hasMany",
+ "model": "InvoiceInIntrastat",
+ "foreignKey": "invoiceInFk"
+ },
"invoiceInTax": {
"type": "hasMany",
"model": "InvoiceInTax",
diff --git a/modules/invoiceIn/front/index.js b/modules/invoiceIn/front/index.js
index 18e9d73c2..7b6d6a77c 100644
--- a/modules/invoiceIn/front/index.js
+++ b/modules/invoiceIn/front/index.js
@@ -10,5 +10,6 @@ import './summary';
import './basic-data';
import './tax';
import './dueDay';
+import './intrastat';
import './create';
import './log';
diff --git a/modules/invoiceIn/front/intrastat/index.html b/modules/invoiceIn/front/intrastat/index.html
new file mode 100644
index 000000000..cb447132d
--- /dev/null
+++ b/modules/invoiceIn/front/intrastat/index.html
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/invoiceIn/front/intrastat/index.js b/modules/invoiceIn/front/intrastat/index.js
new file mode 100644
index 000000000..659929513
--- /dev/null
+++ b/modules/invoiceIn/front/intrastat/index.js
@@ -0,0 +1,60 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+class Controller extends Section {
+ set invoceInIntrastat(value) {
+ this._invoceInIntrastat = value;
+
+ if (value) this.calculateTotals();
+ }
+
+ get invoceInIntrastat() {
+ return this._invoceInIntrastat;
+ }
+
+ calculateTotals() {
+ this.amountTotal = 0.0;
+ this.netTotal = 0.0;
+ this.stemsTotal = 0.0;
+ if (!this.invoceInIntrastat) return;
+
+ this.invoceInIntrastat.forEach(intrastat => {
+ this.amountTotal += intrastat.amount;
+ this.netTotal += intrastat.net;
+ this.stemsTotal += intrastat.stems;
+ });
+ }
+
+ add() {
+ this.$.model.insert({});
+ }
+
+ deleteIntrastat($index) {
+ this.$.model.remove($index);
+ this.$.model.save().then(() => {
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ this.calculateTotals();
+ });
+ }
+
+ onSubmit() {
+ this.$.watcher.check();
+ this.$.model.save().then(() => {
+ this.$.watcher.notifySaved();
+ this.$.watcher.updateOriginalData();
+ this.calculateTotals();
+ this.card.reload();
+ });
+ }
+}
+
+ngModule.vnComponent('vnInvoiceInIntrastat', {
+ template: require('./index.html'),
+ controller: Controller,
+ require: {
+ card: '^vnInvoiceInCard'
+ },
+ bindings: {
+ invoiceIn: '<'
+ }
+});
diff --git a/modules/invoiceIn/front/intrastat/index.spec.js b/modules/invoiceIn/front/intrastat/index.spec.js
new file mode 100644
index 000000000..d7d50ac5b
--- /dev/null
+++ b/modules/invoiceIn/front/intrastat/index.spec.js
@@ -0,0 +1,85 @@
+import './index.js';
+import watcher from 'core/mocks/watcher';
+import crudModel from 'core/mocks/crud-model';
+
+describe('InvoiceIn', () => {
+ describe('Component intrastat', () => {
+ let controller;
+ let $scope;
+ let vnApp;
+
+ beforeEach(ngModule('invoiceIn'));
+
+ beforeEach(inject(($componentController, $rootScope, _vnApp_) => {
+ vnApp = _vnApp_;
+ jest.spyOn(vnApp, 'showError');
+ $scope = $rootScope.$new();
+ $scope.model = crudModel;
+ $scope.watcher = watcher;
+
+ const $element = angular.element('');
+ controller = $componentController('vnInvoiceInIntrastat', {$element, $scope});
+ controller.invoiceIn = {id: 1};
+ }));
+
+ describe('calculateTotals()', () => {
+ it('should set amountTotal, netTotal and stemsTotal to 0 if salesClaimed has no data', () => {
+ controller.invoceInIntrastat = [];
+ controller.calculateTotals();
+
+ expect(controller.amountTotal).toEqual(0);
+ expect(controller.netTotal).toEqual(0);
+ expect(controller.stemsTotal).toEqual(0);
+ });
+
+ it('should set amountTotal, netTotal and stemsTotal', () => {
+ controller.invoceInIntrastat = [
+ {
+ id: 1,
+ invoiceInFk: 1,
+ net: 30.5,
+ intrastatFk: 5080000,
+ amount: 10,
+ stems: 162,
+ countryFk: 5,
+ statisticalValue: 0
+ },
+ {
+ id: 2,
+ invoiceInFk: 1,
+ net: 10,
+ intrastatFk: 6021010,
+ amount: 20,
+ stems: 205,
+ countryFk: 5,
+ statisticalValue: 0
+ }
+ ];
+ controller.calculateTotals();
+
+ expect(controller.amountTotal).toEqual(30);
+ expect(controller.netTotal).toEqual(40.5);
+ expect(controller.stemsTotal).toEqual(367);
+ });
+ });
+
+ describe('onSubmit()', () => {
+ it('should make HTTP POST request to save intrastat values', () => {
+ controller.card = {reload: () => {}};
+ jest.spyOn($scope.watcher, 'check');
+ jest.spyOn($scope.watcher, 'notifySaved');
+ jest.spyOn($scope.watcher, 'updateOriginalData');
+ jest.spyOn(controller.card, 'reload');
+ jest.spyOn($scope.model, 'save');
+
+ controller.onSubmit();
+
+ expect($scope.model.save).toHaveBeenCalledWith();
+ expect($scope.watcher.updateOriginalData).toHaveBeenCalledWith();
+ expect($scope.watcher.check).toHaveBeenCalledWith();
+ expect($scope.watcher.notifySaved).toHaveBeenCalledWith();
+ expect(controller.card.reload).toHaveBeenCalledWith();
+ });
+ });
+ });
+});
diff --git a/modules/invoiceIn/front/locale/es.yml b/modules/invoiceIn/front/locale/es.yml
index 1ebfa8fe2..4f36b33fa 100644
--- a/modules/invoiceIn/front/locale/es.yml
+++ b/modules/invoiceIn/front/locale/es.yml
@@ -9,10 +9,13 @@ InvoiceIn cloned: Factura clonada
InvoiceIn deleted: Factura eliminada
Invoice list: Listado de facturas recibidas
InvoiceIn booked: Factura contabilizada
+Net: Neto
Remove tax: Quitar iva
Remove due day: Quitar vencimiento
Sage tax: Sage iva
Sage transaction: Sage transaccion
Search invoices in by reference: Buscar facturas recibidas por referencia
To book: Contabilizar
-
+Total amount: Total importe
+Total net: Total neto
+Total stems: Total tallos
diff --git a/modules/invoiceIn/front/routes.json b/modules/invoiceIn/front/routes.json
index 0eb6258d3..4867b7db9 100644
--- a/modules/invoiceIn/front/routes.json
+++ b/modules/invoiceIn/front/routes.json
@@ -27,6 +27,10 @@
"state": "invoiceIn.card.dueDay",
"icon": "icon-calendar"
},
+ {
+ "state": "invoiceIn.card.intrastat",
+ "icon": "icon-lines"
+ },
{
"state": "invoiceIn.card.log",
"icon": "history"
@@ -109,6 +113,16 @@
},
"acl": ["administrative"]
},
+ {
+ "url": "/intrastat",
+ "state": "invoiceIn.card.intrastat",
+ "component": "vn-invoice-in-intrastat",
+ "description": "Intrastat",
+ "params": {
+ "invoice-in": "$ctrl.invoiceIn"
+ },
+ "acl": ["administrative"]
+ },
{
"url": "/log",
"state": "invoiceIn.card.log",
diff --git a/modules/invoiceIn/front/summary/index.html b/modules/invoiceIn/front/summary/index.html
index ae6d985f8..3a826eeb7 100644
--- a/modules/invoiceIn/front/summary/index.html
+++ b/modules/invoiceIn/front/summary/index.html
@@ -120,6 +120,37 @@
+
+
+
+
+
+
+ Code
+ Amount
+ Net
+ Stems
+ Country
+
+
+
+
+ {{::intrastat.intrastatFk | zeroFill:8}}: {{::intrastat.intrastat.description}}
+ {{::intrastat.amount | currency: 'EUR':2}}
+ {{::intrastat.net}}
+ {{::intrastat.stems}}
+ {{::intrastat.country.code}}
+
+
+
+
+