Merge tag 'Hotfix-QtaDoc' into develop

Finish Hotfix-QtaDoc
This commit is contained in:
Giuseppe Scorrano 2020-04-14 17:04:15 +02:00
commit 1c5a82b6b7
2 changed files with 4 additions and 4 deletions

View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 135 def appVersionCode = 136
def appVersionName = '1.12.6' def appVersionName = '1.12.7'
signingConfigs { signingConfigs {
release { release {

View File

@ -100,8 +100,8 @@ public class UltimeConsegneClienteRESTConsumer {
" ,dtb_docr.[cod_mart]" + " ,dtb_docr.[cod_mart]" +
" ,dtb_docr.[descrizione]" + " ,dtb_docr.[descrizione]" +
" ,dtb_docr.[unt_doc]" + " ,dtb_docr.[unt_doc]" +
" ,dtb_docr.[rap_conv]" + " ,(dtb_docr.[rap_conv] / dtb_docr.[rap_conv]) as rap_conv" +
" ,dtb_docr.[qta_doc] - ISNULL(mtb_colr.qta_col, 0) as qta_doc" + " ,(dtb_docr.[qta_doc] * dtb_docr.[rap_conv]) - ISNULL(mtb_colr.qta_col, 0) as qta_doc" +
" ,dtb_docr.[val_unt]" + " ,dtb_docr.[val_unt]" +
" ,dtb_docr.[sconto5]" + " ,dtb_docr.[sconto5]" +
" ,dtb_docr.[sconto6]" + " ,dtb_docr.[sconto6]" +