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

Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Pau 2023-01-10 12:57:39 +00:00
parent 4cfa63918f 1f1a69a2b4
commit e0cf45546e
8 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- [General](Inicio) Permite recuperar la contraseña
- [Artículo](Datos Básicos) Añadido campo Unidades/Caja
### Changed

4
db/changes/230201/00-autoincrement_VnReport_VnPrinter.sql Normal file
View File

@ -0,0 +1,4 @@
SET FOREIGN_KEY_CHECKS = 0;
ALTER TABLE `vn`.`report` MODIFY COLUMN id tinyint(3) unsigned NOT NULL AUTO_INCREMENT;
ALTER TABLE `vn`.`printer` MODIFY COLUMN id tinyint(3) unsigned NOT NULL AUTO_INCREMENT;
SET FOREIGN_KEY_CHECKS = 1;

1
e2e/helpers/selectors.js
View File

@ -463,6 +463,7 @@ export default {
generic: 'vn-autocomplete[ng-model="$ctrl.item.genericFk"]',
isFragile: 'vn-check[ng-model="$ctrl.item.isFragile"]',
longName: 'vn-textfield[ng-model="$ctrl.item.longName"]',
packingOut: 'vn-input-number[ng-model="$ctrl.item.packingOut"]',
isActiveCheckbox: 'vn-check[label="Active"]',
priceInKgCheckbox: 'vn-check[label="Price in kg"]',
newIntrastatButton: 'vn-item-basic-data vn-icon-button[vn-tooltip="New intrastat"] > button',

8
e2e/paths/04-item/02_basic_data.spec.js
View File

@ -35,6 +35,7 @@ describe('Item Edit basic data path', () => {
await page.waitToClick(selectors.itemBasicData.isActiveCheckbox);
await page.waitToClick(selectors.itemBasicData.priceInKgCheckbox);
await page.waitToClick(selectors.itemBasicData.isFragile);
await page.write(selectors.itemBasicData.packingOut, '5');
await page.waitToClick(selectors.itemBasicData.submitBasicDataButton);
const message = await page.waitForSnackbar();
@ -128,4 +129,11 @@ describe('Item Edit basic data path', () => {
expect(result).toBe('checked');
});
it(`should confirm the item packingOut was edited`, async() => {
const result = await page
.waitToGetProperty(selectors.itemBasicData.packingOut, 'value');
expect(result).toEqual('5');
});
});

2
modules/client/front/balance/create/index.js
View File

@ -4,7 +4,7 @@ import Dialog from 'core/components/dialog';
class Controller extends Dialog {
constructor($element, $, $transclude, vnReport) {
super($element, $, $transclude);
this.viewReceipt = true;
this.vnReport = vnReport;
this.receipt = {};
}

1
modules/client/front/balance/create/index.spec.js
View File

@ -75,6 +75,7 @@ describe('Client', () => {
jest.spyOn(controller.vnReport, 'show');
controller.$params = {id: 1101};
controller.viewReceipt = false;
$httpBackend.expect('POST', `Clients/1101/createReceipt`).respond({id: 1});
controller.responseHandler('accept');

37
modules/item/front/basic-data/index.html
View File

@ -1,6 +1,6 @@
<mg-ajax
path="Items/{{patch.params.id}}"
options="vnPatch"
<mg-ajax
path="Items/{{patch.params.id}}"
options="vnPatch"
override="{filter: {include: [{relation: 'itemType'}, {relation: 'origin'}, {relation: 'ink'}, {relation: 'producer'}, {relation: 'expense'}]}}">
</mg-ajax>
<vn-watcher
@ -26,8 +26,8 @@
rule
vn-focus>
</vn-textfield>
<vn-textfield
vn-one label="Full name"
<vn-textfield
vn-one label="Full name"
ng-model="$ctrl.item.longName"
rule
info="Full name calculates based on tags 1-3. Is not recommended to change it manually">
@ -95,7 +95,7 @@
<vn-input-number
vn-one
min="0"
label="Relevancy"
label="Relevancy"
ng-model="$ctrl.item.relevancy"
rule>
</vn-input-number>
@ -108,15 +108,15 @@
</vn-input-number>
<vn-input-number
vn-one
min="0"
label="stems"
min="0"
label="stems"
ng-model="$ctrl.item.stems"
rule>
</vn-input-number>
<vn-input-number
vn-one
min="0"
label="Multiplier"
label="Multiplier"
ng-model="$ctrl.item.stemMultiplier">
</vn-input-number>
</vn-horizontal>
@ -124,10 +124,17 @@
<vn-input-number
vn-one
min="0"
label="Weight/Piece"
label="Weight/Piece"
ng-model="$ctrl.item.weightByPiece"
rule>
</vn-input-number>
<vn-input-number
vn-one
min="0"
label="Units/Box"
ng-model="$ctrl.item.packingOut"
rule>
</vn-input-number>
<vn-autocomplete
vn-one
label="Generic"
@ -192,7 +199,7 @@
</form>
<!-- Create custom agent dialog -->
<vn-dialog class="edit"
<vn-dialog class="edit"
vn-id="intrastat"
on-accept="$ctrl.onIntrastatAccept()"
message="New intrastat">
@ -225,12 +232,12 @@
<tpl-body class="itemFilter">
<vn-horizontal>
<vn-textfield
label="Name"
label="Name"
ng-model="$ctrl.itemFilterParams.name"
vn-focus>
</vn-textfield>
<vn-textfield
label="Size"
label="Size"
ng-model="$ctrl.itemFilterParams.size">
</vn-textfield>
<vn-autocomplete
@ -262,7 +269,7 @@
</vn-button>
</vn-horizontal>
<vn-crud-model
vn-id="itemsModel"
vn-id="itemsModel"
url="Items/withName"
filter="$ctrl.itemFilter"
data="items"
@ -305,4 +312,4 @@
warehouse-fk="$ctrl.vnConfig.warehouseFk">
</vn-item-descriptor-popover>
</tpl-body>
</vn-dialog>
</vn-dialog>

3
modules/item/front/locale/es.yml
View File

@ -44,6 +44,7 @@ Weight/Piece: Peso/tallo
Search items by id, name or barcode: Buscar articulos por identificador, nombre o codigo de barras
SalesPerson: Comercial
Concept: Concepto
Units/Box: Unidades/Caja
# Sections
Items: Artículos
@ -61,4 +62,4 @@ Item diary: Registro de compra-venta
Last entries: Últimas entradas
Tags: Etiquetas
Waste breakdown: Desglose de mermas
Waste breakdown by item: Desglose de mermas por artículo
Waste breakdown by item: Desglose de mermas por artículo