6745-2404_testToMaster #1950

Merged
alexm merged 191 commits from 6745-2404_testToMaster into master 2024-01-25 07:39:13 +00:00
2 changed files with 1 additions and 9 deletions
Showing only changes of commit bf44f82f4f - Show all commits

View File

@ -74,12 +74,6 @@ module.exports = Self => {
description: 'Destination state', description: 'Destination state',
required: false required: false
}, },
{
arg: 'totalWithVat',
type: 'string',
description: 'Total price with vat',
required: false
},
{ {
arg: 'problems', arg: 'problems',
type: 'boolean', type: 'boolean',
@ -138,8 +132,6 @@ module.exports = Self => {
return {'f.stateCode': {like: `%${value}%`}}; return {'f.stateCode': {like: `%${value}%`}};
case 'futureState': case 'futureState':
return {'f.futureStateCode': {like: `%${value}%`}}; return {'f.futureStateCode': {like: `%${value}%`}};
case 'totalWithVat':
return {'t.totalWithVat': value};
} }
}); });

View File

@ -61,7 +61,7 @@
<th field="liters"> <th field="liters">
<span translate>Liters</span> <span translate>Liters</span>
</th> </th>
<th field="futureTotalWithVat"> <th field="totalWithVat">
<span translate>Import</span> <span translate>Import</span>
</th> </th>
<th shrink field="lines"> <th shrink field="lines">