Merge branch 'R12.00' of http://10.65.20.33/sirio/CAMPO/campo into R12.00

2021-12-17 15:37:37 +01:00 · 2021-12-17 15:37:37 +01:00 · 92256b6d96
commit 92256b6d96
parent 56d198f849 4c7dc46178
6 changed files with 8 additions and 4 deletions
--- a/src/ba/f9.dir
+++ b/src/ba/f9.dir
@ -1,3 +1,7 @@
 9
 1
+<<<<<<< HEAD
+%nditte|0|0|652|0|Ditte|||
+=======
 %nditte|0|0|754|0|Ditte|||
+>>>>>>> 0cadcd6dee4a4a67021c26174d7dea2a761fe182
--- a/src/ca/f151.dir
+++ b/src/ca/f151.dir
@ -1,3 +1,3 @@
 151
 0
-$saldana|0|0|195|0|Saldi contabilita' analitica|||
+$saldana|0|0|189|0|Saldi contabilita' analitica|||
--- a/src/cg/f20.dir
+++ b/src/cg/f20.dir
@ -1,3 +1,3 @@
 20
 0
-$clifo|0|0|931||Clienti/Fornitori|||
+$clifo|0|0|916|0|Clienti/Fornitori|||
--- a/src/cg/f23.dir
+++ b/src/cg/f23.dir
@ -1,3 +1,3 @@
 23
 0
-$mov|||614|0|Movimenti di prima nota|NMOV||
+$mov|96160|96160|586|0|Movimenti di prima nota|NMOV||
--- a/src/li/f154.dir
+++ b/src/li/f154.dir
@ -1,3 +1,3 @@
 154
 0
-$letint|0|0|143|0|Lettere d'intento|||
+$letint|0|0|135|0|Lettere d'intento|||
--- a/src/ps/CRPA/CUSTOM/ps1001.exe
+++ b/src/ps/CRPA/CUSTOM/ps1001.exe