Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jorge Penadés 2024-12-12 09:58:42 +01:00
commit 8b37d99287
8 changed files with 85 additions and 6 deletions

View File

@ -2128,7 +2128,7 @@ INSERT INTO `ACL` VALUES (746,'Claim','getSummary','READ','ALLOW','ROLE','claimV
INSERT INTO `ACL` VALUES (747,'CplusRectificationType','*','READ','ALLOW','ROLE','administrative',NULL);
INSERT INTO `ACL` VALUES (748,'SiiTypeInvoiceOut','*','READ','ALLOW','ROLE','salesPerson',NULL);
INSERT INTO `ACL` VALUES (749,'InvoiceCorrectionType','*','READ','ALLOW','ROLE','salesPerson',NULL);
INSERT INTO `ACL` VALUES (750,'InvoiceOut','transferInvoice','WRITE','ALLOW','ROLE','administrative',NULL);
INSERT INTO `ACL` VALUES (750,'InvoiceOut','transfer','WRITE','ALLOW','ROLE','administrative',NULL);
INSERT INTO `ACL` VALUES (751,'Application','executeProc','*','ALLOW','ROLE','employee',NULL);
INSERT INTO `ACL` VALUES (752,'Application','executeFunc','*','ALLOW','ROLE','employee',NULL);
INSERT INTO `ACL` VALUES (753,'NotificationSubscription','getList','READ','ALLOW','ROLE','employee',NULL);

View File

@ -0,0 +1,2 @@
ALTER TABLE vn.`zone` MODIFY COLUMN `price` DECIMAL(10,2);

View File

@ -247,5 +247,7 @@
"The raid information is not correct": "The raid information is not correct",
"Payment method is required": "Payment method is required",
"Sales already moved": "Sales already moved",
"Holidays to past days not available": "Holidays to past days not available"
"Holidays to past days not available": "Holidays to past days not available",
"There are tickets to be invoiced": "There are tickets to be invoiced for this zone, please delete them first",
"Price cannot be blank": "Price cannot be blank"
}

View File

@ -388,10 +388,10 @@
"You do not have permission to modify the booked field": "No tienes permisos para modificar el campo contabilizada",
"ticketLostExpedition": "El ticket [{{ticketId}}]({{{ticketUrl}}}) tiene la siguiente expedición perdida:{{ expeditionId }}",
"The web user's email already exists": "El correo del usuario web ya existe",
"Sales already moved": "Ya han sido transferidas",
"The raid information is not correct": "La información de la redada no es correcta",
"There are tickets to be invoiced": "Hay tickets para esta zona, borralos primero",
"Sales already moved": "Ya han sido transferidas",
"The raid information is not correct": "La información de la redada no es correcta",
"There are tickets to be invoiced": "Hay tickets para esta zona, borralos primero",
"Price cannot be blank": "Price cannot be blank",
"An item type with the same code already exists": "Un tipo con el mismo código ya existe",
"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles"
}

View File

@ -14,4 +14,18 @@ module.exports = Self => {
Self.validatesPresenceOf('agencyModeFk', {
message: `Agency cannot be blank`
});
Self.validatesPresenceOf('price', {
message: 'Price cannot be blank'
});
Self.validateAsync('price', priceIsValid, {
message: 'Price must be greater than 0'
});
async function priceIsValid(err, done) {
if (this.price <= 0)
err();
done();
}
};

View File

@ -0,0 +1,6 @@
subject: Incoterms Authorization
title: Incoterms Authorization
description:
dear: Dear customer
instructions: Please find attached the Incoterms authorization form, which you must complete and sign.
conclusion: Thank you for your attention!

View File

@ -0,0 +1,16 @@
reportName: balance-compensation
Place: Algemesí, on
Compensation: Compensation of debtor and creditor balances
In one hand: On one hand
CIF: with CIF
NIF: with NIF
Home: and address located at
In other hand: On the other hand
Sr: Mr./Ms.
Agree: Agree
Date: On the date of
Compensate: the balance of has been compensated
From client: from the client/supplier
Against the balance of: against the balance of
Reception: Please confirm receipt of this compensation at the email
Greetings: Best regards,

View File

@ -0,0 +1,39 @@
reportName: autorization-incoterms
description: '<em>{socialName}</em> a duly constituted and responsible company <em>limited</em>
and registered under corporate law {country} and here represented by {socialName}, with address in {address},
CIF <em>{fiscalID}</em>. Hereinafter referred to as {name}.'
issued: 'In {0}, on {1} of {2} of {3}'
client: 'Customer {0}'
declaration: '<em>{socialName}</em> hereby declares that:'
declarations:
- 'All purchases made by {socialName} with {companyName} They are delivered according to the conditions defined in the Incoterm.'
- '{socialName} recognizes that it is important for {companyName} have
proof of intra-community delivery of the goods to {destinationCountry} to
be able to invoice with 0% VAT.'
- 'Therefore, by signing this agreement, {socialName} declares that all goods
purchased from {companyName} will be delivered to {destinationCountry}.'
- 'Besides, {socialName} shall, at the first request of {companyName},
provide proof that all products purchased from {companyName} have
been delivered in {destinationCountry}.'
- 'In addition to the above, {companyName} will provide to {socialName}
a monthly summary that includes all bills (and corresponding deliveries).
{socialName} will sign and return the monthly summary to {companyName},
S.L. within 5 days of receiving the summary.'
signer:
representative: Representative
representativeRole: Position of the representative
signed: Date of signature
manager: Manager
months:
- 'January'
- 'February'
- 'March'
- 'April'
- 'May'
- 'June'
- 'July'
- 'August'
- 'September'
- 'October'
- 'November'
- 'December'