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

2940-invoiceInTax-section #680

Merged
joan merged 36 commits from 2940-invoiceInTax-section into dev 2021-08-13 06:11:07 +00:00
Conversation 0 Commits 36 Files Changed 29 +640 -4802
jgallego commented 2021-06-29 07:01:35 +00:00
Owner
Copy Link
No description provided.
jgallego added 11 commits 2021-06-29 07:01:37 +00:00
gitea/salix/pipeline/head This commit looks good Details
8878a2280a models
gitea/salix/pipeline/head This commit looks good Details
acf03959f5 creada seccion invoiceInTax
gitea/salix/pipeline/head This commit looks good Details
44ce54ede4 seccion en summary
gitea/salix/pipeline/head This commit looks good Details
5369e8d97e Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
500b68162b summary con chip
gitea/salix/pipeline/head This commit looks good Details
dc0212d2fc chip
gitea/salix/pipeline/head This commit looks good Details
a6c093cf16 Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
82e65ec1c3 rellena campo rate
gitea/salix/pipeline/head This commit looks good Details
02cd2283a7 summary total
gitea/salix/pipeline/head This commit looks good Details
e217f02321 test front
jgallego added 1 commit 2021-06-29 08:33:11 +00:00
gitea/salix/pipeline/head This commit looks good Details
59fac7edfa fixtures
carlosjr requested changes 2021-06-29 11:21:44 +00:00
modules/invoiceIn/back/methods/invoice-in/specs/summary.spec.js Outdated
@ -5,5 +5,6 @@ describe('invoiceIn summary()', () => {
const summary = await app.models.InvoiceIn.summary(1);
expect(summary.supplierRef).toEqual('1234');
expect(summary.totals).toEqual('1234');
carlosjr commented 2021-06-29 10:54:12 +00:00
Contributor
Copy Link

doesn't seem to be a good approach to use the same values on different fields.

doesn't seem to be a good approach to use the same values on different fields.
joan marked this conversation as resolved
modules/invoiceIn/back/methods/invoice-in/summary.js Outdated
@ -43,0 +43,4 @@
{
relation: 'invoiceInTax',
scope: {
fields: ['id', 'invoiceInFk', 'taxableBase', 'expenseFk', 'taxTypeSageFk', 'transactionTypeSageFk', 'foreignValue'],
carlosjr commented 2021-06-29 10:55:07 +00:00
Contributor
Copy Link

lines longer than 80 to 120 characters require indentation.

lines longer than 80 to 120 characters require indentation.
joan marked this conversation as resolved
modules/invoiceIn/back/models/invoice-in-tax.json Outdated
@ -0,0 +12,4 @@
"properties": {
"id": {
"id": true,
"type": "Number",
carlosjr commented 2021-06-29 10:59:49 +00:00
Contributor
Copy Link

inconsistent type definition, use lowercase.

inconsistent type definition, use lowercase.
joan marked this conversation as resolved
modules/invoiceIn/front/summary/index.html Outdated
@ -48,0 +51,4 @@
<vn-label translate>Due day</vn-label>
<vn-chip
class="transparent"
translate-attr=" $ctrl.summary.totals.totalDueDay != $ctrl.summary.totals.totalTaxableBase && $ctrl.summary.totals.totalDueDay != $ctrl.summary.totals.totalVat ? {title: 'No coinciden'} : {title: 'Vencimiento'}"
carlosjr commented 2021-06-29 11:07:20 +00:00
Contributor
Copy Link

extraction to a getter would be nice, making it more readable.

Also using translate-attr with spanish tittle is inconsistent.

extraction to a getter would be nice, making it more readable. Also using translate-attr with spanish tittle is inconsistent.
joan marked this conversation as resolved
modules/invoiceIn/front/summary/index.html Outdated
@ -50,0 +83,4 @@
<vn-td shrink>{{::tax.taxableBase | currency: 'EUR':2}}</vn-td>
<vn-td>{{::tax.taxTypeSage.vat}}</vn-td>
<vn-td>{{::tax.transactionTypeSage.transaction}}</vn-td>
<vn-td number shrink>{{::0.2 | percentage}}</vn-td>
carlosjr commented 2021-06-29 11:08:55 +00:00
Contributor
Copy Link

is 0.2 an static value?

also using :: before static values is incorrect.

is 0.2 an static value? also using :: before static values is incorrect.
joan marked this conversation as resolved
modules/invoiceIn/front/summary/style.scss Outdated
@ -1,5 +1,15 @@
@import "variables";
@import "./variables";
@import "./effects";
carlosjr commented 2021-06-29 11:11:49 +00:00
Contributor
Copy Link

this import doesn't seem to be needed

this import doesn't seem to be needed
joan marked this conversation as resolved
modules/invoiceIn/front/tax/index.html Outdated
@ -0,0 +1,110 @@
<vn-crud-model
vn-id="model"
url="InvoiceInTaxes"
fields="['id', 'invoiceInFk', 'taxableBase', 'expenseFk', 'foreignValue', 'taxTypeSageFk', 'transactionTypeSageFk']"
carlosjr commented 2021-06-29 11:13:13 +00:00
Contributor
Copy Link

lines longer than 80 to 120 characters shoueld be indented

lines longer than 80 to 120 characters shoueld be indented
joan marked this conversation as resolved
modules/invoiceIn/front/tax/index.html Outdated
@ -0,0 +47,4 @@
on-change="$ctrl.setTaxRate = $value"
rule>
</vn-input-number>
carlosjr commented 2021-06-29 11:14:15 +00:00
Contributor
Copy Link

trailling space not needed betweent hatml tags in this case

trailling space not needed betweent hatml tags in this case
joan marked this conversation as resolved
modules/invoiceIn/front/tax/index.html Outdated
@ -0,0 +78,4 @@
</vn-input-number>
<vn-input-number vn-one
disabled="$ctrl.invoiceIn.currency.code == 'EUR'"
type="number"
carlosjr commented 2021-06-29 11:15:31 +00:00
Contributor
Copy Link

vn-input-number doesn't require the property type="number"

vn-input-number doesn't require the property type="number"
joan marked this conversation as resolved
modules/invoiceIn/front/tax/index.js Outdated
@ -0,0 +6,4 @@
super($element, $);
}
get setTaxRate() {
carlosjr commented 2021-06-29 11:17:41 +00:00
Contributor
Copy Link

rename to taxRateSelection

rename to taxRateSelection
joan marked this conversation as resolved
jgallego added 1 commit 2021-06-30 06:26:14 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
9371c49922 cambios solicitados
jgallego added 1 commit 2021-06-30 06:30:53 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
9054aa0885 Merge branch 'dev' into 2940-invoiceInTax-section
jgallego added 1 commit 2021-07-08 05:21:05 +00:00
jgallego added 1 commit 2021-07-08 06:19:40 +00:00
jgallego added 1 commit 2021-07-08 06:23:11 +00:00
jgallego added 1 commit 2021-07-08 08:06:52 +00:00
gitea/salix/pipeline/head This commit looks good Details
8c1d9853eb selector fixed
jgallego added 1 commit 2021-07-12 13:27:49 +00:00
gitea/salix/pipeline/head This commit looks good Details
2f265760b4 permisos invoceInTax
jgallego added 1 commit 2021-07-14 05:49:15 +00:00
gitea/salix/pipeline/head This commit looks good Details
3ec8d4583f bug
jgallego added 12 commits 2021-07-15 10:51:03 +00:00
gitea/salix/pipeline/head This commit looks good Details
3b2b4e3819 client module changes for transactions
gitea/salix/pipeline/head This commit looks good Details
878e989c02 HOTFIX: Disable address without a province
gitea/salix/pipeline/head This commit looks good Details
21e34de1dd item module transactions
gitea/salix/pipeline/head This commit looks good Details
98a691c152 minor changes
gitea/salix/pipeline/head This commit looks good Details
ea78db1441 3012 - Hotfix: Get ticket list
gitea/salix/pipeline/head This commit looks good Details
c72cefe61e Merge pull request '3002-more_module_transactions' (#688) from 3002-more_module_transactions into dev 
Reviewed-on: #688
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
c509509963 Merge branch 'dev' into 2940-invoiceInTax-section
jgallego added 1 commit 2021-07-16 15:20:02 +00:00
gitea/salix/pipeline/head This commit looks good Details
ee30bc9e1e test fixed
carlosjr added 1 commit 2021-07-19 10:25:57 +00:00
joan added 1 commit 2021-08-09 12:06:35 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
cbaba8a075 Ammends
jgallego added 1 commit 2021-08-10 06:18:59 +00:00
gitea/salix/pipeline/head This commit looks good Details
3424fabd5b test fixed
jgallego added 1 commit 2021-08-10 07:45:12 +00:00
gitea/salix/pipeline/head This commit looks good Details
d49242751e Merge branch 'dev' into 2940-invoiceInTax-section
jgallego added 1 commit 2021-08-12 05:39:33 +00:00
gitea/salix/pipeline/head This commit looks good Details
54634ed22d test okl
jgallego added 1 commit 2021-08-12 07:24:49 +00:00
gitea/salix/pipeline/head This commit looks good Details
92c3a24b1b dash
jgallego added 2 commits 2021-08-12 08:02:32 +00:00
gitea/salix/pipeline/head Build queued... Details
5f390f996f package
jgallego added 1 commit 2021-08-12 08:02:41 +00:00
gitea/salix/pipeline/head This commit looks good Details
da9eddbf9e package
joan added the
e2e
 label 2021-08-12 08:41:09 +00:00
joan requested changes 2021-08-12 09:46:10 +00:00
loopback/locale/es.json Outdated
@ -195,6 +195,7 @@
"This document already exists on this ticket": "Este documento ya existe en el ticket",
"Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
"You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
"INACTIVE_PROVIDER": "INACTIVE_PROVIDER",
joan commented 2021-08-12 09:44:55 +00:00
Contributor
Copy Link

Añadir traducción

Añadir traducción
jgallego added 1 commit 2021-08-12 12:00:24 +00:00
gitea/salix/pipeline/head This commit looks good Details
5efcd6a57e translation
carlosjr added 3 commits 2021-08-12 15:29:02 +00:00
carlosjr removed the
e2e
 label 2021-08-12 15:30:22 +00:00
carlosjr approved these changes 2021-08-12 15:33:37 +00:00
carlosjr left a comment
Contributor
Copy Link

LGTM

LGTM
joan added 1 commit 2021-08-13 06:04:53 +00:00
joan approved these changes 2021-08-13 06:10:56 +00:00
joan merged commit 590cd8af0b into dev 2021-08-13 06:11:07 +00:00
joan deleted branch 2940-invoiceInTax-section 2021-08-13 06:11:17 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
carlosjr
joan
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#680
No description provided.
Delete Branch "2940-invoiceInTax-section"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?