From d8b742d3ff761c63e3d2d42f4b70fc783edf51e6 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Mon, 3 Mar 2008 18:22:45 +0000
Subject: [PATCH] =?UTF-8?q?Ticket=20#50:=20Poner=20referencia=20de=20fabri?=
 =?UTF-8?q?cante=20en=20la=20ficha=20del=20art=C3=ADculo.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@325 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Database/scripts/factuges.sql                 |  13 +-
 .../Articulos/Data/Articulos_data.dproj       |  11 +-
 .../Modulos/Articulos/Data/Articulos_data.res | Bin 384 -> 5028 bytes
 .../Articulos/Data/uDataModuleArticulos.dfm   |  27 +-
 .../Articulos/Model/Articulos_model.dproj     |   2 +-
 .../Articulos/Model/Articulos_model.res       | Bin 384 -> 4748 bytes
 .../Model/schArticulosClient_Intf.pas         | 116 +++++--
 .../Model/schArticulosServer_Intf.pas         |  94 +++++-
 .../Articulos/Servidor/srvArticulos_Impl.dfm  | 107 ++++--
 .../Articulos/Views/Articulos_view.res        | Bin 4748 -> 384 bytes
 .../Views/uEditorElegirArticulos.dfm          |  10 +
 .../Modulos/Articulos/Views/uViewArticulo.dfm | 310 ++++++++++--------
 .../Modulos/Articulos/Views/uViewArticulo.pas |   7 +-
 13 files changed, 492 insertions(+), 205 deletions(-)

diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index 8001cfb5..11b3fd86 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -4,10 +4,10 @@
 
 SET SQL DIALECT 3;
 
-SET NAMES UTF8;
+SET NAMES ISO8859_1;
 
 CREATE DATABASE 'FACTUGES.FDB' PAGE_SIZE 4096
-DEFAULT CHARACTER SET UTF8;
+DEFAULT CHARACTER SET ISO8859_1;
 
 /******************************************************************************/
 /****                        User Defined Functions                        ****/
@@ -388,7 +388,8 @@ CREATE TABLE ARTICULOS (
     DESCUENTO           TIPO_PORCENTAJE,
     PRECIO_NETO         TIPO_IMPORTE,
     PRECIO_PORTE        TIPO_IMPORTE,
-    FABRICANTE            VARCHAR(255),
+    FABRICANTE          VARCHAR(255),
+	REFERENCIA_FABR	    VARCHAR(255),
     FECHA_ALTA          TIMESTAMP,
     FECHA_MODIFICACION  TIMESTAMP,
     USUARIO             TIPO_USUARIO,
@@ -1399,7 +1400,8 @@ CREATE VIEW V_ARTICULOS(
     ID_PROVEEDOR,
     NOMBRE_PROVEEDOR,
     ELIMINADO,
-    FABRICANTE)
+    FABRICANTE,
+	REFERENCIA_FABR)
 AS
 SELECT ARTICULOS.ID, ARTICULOS.ID_EMPRESA, ARTICULOS.REFERENCIA, ARTICULOS.DESCRIPCION,
        ARTICULOS.UNIDAD_MEDIDA, ARTICULOS.FAMILIA, ARTICULOS.IMAGEN, 
@@ -1414,7 +1416,8 @@ SELECT ARTICULOS.ID, ARTICULOS.ID_EMPRESA, ARTICULOS.REFERENCIA, ARTICULOS.DESCR
        ARTICULOS.ID_PROVEEDOR,
        CONTACTOS.NOMBRE AS NOMBRE_PROVEEDOR,
        ARTICULOS.ELIMINADO,
-       ARTICULOS.FABRICANTE
+       ARTICULOS.FABRICANTE,
+	   ARTICULOS.REFERENCIA_FABR
 FROM ARTICULOS
 LEFT OUTER JOIN CONTACTOS ON (CONTACTOS.ID = ARTICULOS.ID_PROVEEDOR)
 WHERE (ARTICULOS.ELIMINADO = 0)
diff --git a/Source/Modulos/Articulos/Data/Articulos_data.dproj b/Source/Modulos/Articulos/Data/Articulos_data.dproj
index c93db0a9..59e770bf 100644
--- a/Source/Modulos/Articulos/Data/Articulos_data.dproj
+++ b/Source/Modulos/Articulos/Data/Articulos_data.dproj
@@ -47,14 +47,19 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Articulos_data.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Articulos_data.dpk</Source></Source><Excluded_Packages>
+      
+      
+      <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+    </Excluded_Packages></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="Articulos_data.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Articulos_model.dcp" />
+    <DCCReference Include="..\..\..\Articulos_model.dcp" />
     <DCCReference Include="uDataModuleArticulos.pas">
       <Form>DataModuleArticulos</Form>
     </DCCReference>
@@ -62,7 +67,7 @@
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
-EurekaLog Version=6006
+EurekaLog Version=6011
 Activate=0
 Activate Handle=1
 Save Log File=1
diff --git a/Source/Modulos/Articulos/Data/Articulos_data.res b/Source/Modulos/Articulos/Data/Articulos_data.res
index 8b251f312bcccec5485024f6fe8d80e1cdf25746..02236de8db669bbe3315cfec9671db4bcf8913dc 100644
GIT binary patch
literal 5028
zcmbW5&x;&Y5XWni1tkRCgZEiPMD`#n<lc%g5Ktq=3Ar_k#u!XCA;yEJ-ajJu$w5T=
zFYqG0XW3(p!sg)J96gBb_fz$%yJs>RcWtPt_oH5Yzu$VV-wb1Bwk_-XFg2H+pSN=U
zyka(dZfonp#SD5!jcwWcvJG#kp*8>anb&hWI5@DjY24FJ`|-&Wn^$uqCj8E%Jsr>a
z(f=18FcLdGW67gkv_9X9SKG|36^E%gpYEy6iCd_cw7Wj~iaqH`jCsjRp5)Tjjm3D>
z0$yNKhb0agb9}Iy*6di=$H_r$<y`lGgSCsX)?QoTFdlfpq3_V&ICii2srI(s@z~J*
zRNAE*{cu>wE8prvehh4CJk(k3<ltU?k0YP*c>R41_1_tIpwah8HE0zJ2j_A8qJC;h
zPS-&^`8?-X2glUhT>Qz`_tI1oCl0I;m#I0|PPJD&x?6D9=#RXC$36y!sH@L4V9JUQ
zO~GN_lzo;~$4gKBX=lH9n~Y`sLpL>Q25j^&9{X3YYiX$(S>$ceRjZ9(sJ1i3RjRX$
zJu%I-9czh^DgT^)7wf?X1I?kkwO%pV4}9frWWqiC{m|pl-!`rHskb%S2V!cllLNls
zE@6uUea$64TFH%f9$nE+PL0j$(Csl@jKP6E`|sEbVb9<xU(3%}7y7N4Y6oA&T*ID6
zp69>)6dbzX;O}gsJTj}n*BLwN2Tb~Kb^L{5h^^(TFzVy_mCyAq;GlLVY)tF3_WiN;
zt9xq60Zw2BHhBxa;yCwUat@+RjSJ72e5G}Da6ls%zW<5a6%IO|%y~`w-r(SEy&sHI
zL+1cCHjDjtOmT-3ZMb?3gym;Z+``j8sjb>;9XPzh1Ge(To)-Pdp&Ip5b5maQQy<>x
z;4$(~Uhbs_4A-Xo;KtoTef7S9KQ-lxGhB4nh09EwmCN_M=+8a!eWK2a1qWTe_u|K$
z>+h*>83&sj-d=;xdarjSeloa(>HLWs?{nM%q2JF2IMkyqd$b@%^>5HxIH;ZY;n(Z;
z`YV@X*6eMVNk4OW=Xi}Y7w2AH*r}hhAN!-V;LE^FW1cqe-%{<%KE%1>{(@uVA|LvF
z|J6pX*Qr*1#WC+WyTI~!t<AfUxqKgJd%szaA7>ifW$(x@{fY0n3w~h7eA|@stGrQv
zano30;rWe#Pb24Q4SWw4<$gm$!H@c@ue~+n9nIRryEg0(+$zOst?!S#pU1kqlj4xy
z?W|eF_rC5r|L#bP*?9l?`BR^oVDRJqA{V;Q?%brE8m88~7veY6SckRvIty{Hp<jB0
zL;lbh=LdcK2I4*UarL>UhO;SN#DLEo$afXFl8=h$ZPu>i@PdBM=dt#yd=JphyT;Fi
zIQqF4Zk}DR{Jtr;c?QAeNiOT~8RIN^y{oa_S@$Jhp*ytayUTk9_Q0WuHno^O%=2Eo
zjKgr|XJEi(>X)&p@p#YD9yx%u`Y?vAdl!-udqj-iGgab^KEC$~j?P2=j!d8D-E*uG
zP@i!u@lN!|@m<2%KqGbIPNWY<KT8^){+9FoFEv;LJq!&TIAff()0ko%Q)iOj4;Wnh
z_ptk@3As=6B!`!shZlIkci?eU-bpx|4LkWI2fS-LMIAh@E47er_9pXW-n05#kEb3l
z<#Kf7^Tg%4v*Mi;pZQMfPs+18-XEIv8vI-Km+ZOhne4FGfjoBB=RkiuV25Vsv1ewl
zDEI5am<g*AX5Sy4@82-9U0L71W}nyxcGW(WeQ4L@^O^py!M_>$KVy5_|JC4MkPW+e
z&io&azTZ-w4PUlv<9{JH&t1~k4ZCi&K0mV0)w=2kwc}k;o9EZfKmQ?L7$cFZqN!(7
z79-yEk6(P?x;?UocE|SZwq23GYqykn-@dl{ihArZyHd3)g}Zi19ANaOvTbPezTLA2
zwx{?Xq<T-iTLZw3$7IgSn)%MYbgT!$yrZ@IL+q}-s_2Zpq1cCt9%J6KcZHso`0#w>
zvHQZlyTagY$NyOKw|y4255yC-x9uCPj3;=GabGB6&%V;Sd-4zMTQSKeVy~4PR1MtZ
zO>e9~)aWzC-dDEorTx(gLsKo$y&SWuepUNrCv(HOCGxmqW^eg!hl+i1zpKb;y)Rt+
GWAk6yB6aNm

delta 60
zcmZ3Y-oQLTfyse!vYwzEi1HKk5Mg0pWIzQA7$&b0RAQ=On0!u9Y_f@v!DJob3IIQa
B3o!ry

diff --git a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
index 4f26d644..58a4ef60 100644
--- a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
+++ b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
@@ -58,6 +58,8 @@ inherited DataModuleArticulos: TDataModuleArticulos
         Name = 'UNIDAD_MEDIDA'
         DataType = datString
         Size = 255
+        DisplayLabel = 'Unidad de medida'
+        DictionaryEntry = 'Articulos_UNIDAD_MEDIDA'
       end
       item
         Name = 'FAMILIA'
@@ -110,7 +112,7 @@ inherited DataModuleArticulos: TDataModuleArticulos
       item
         Name = 'PRECIO_PORTE'
         DataType = datCurrency
-        DisplayLabel = 'Porte'
+        DisplayLabel = 'Precio porte'
         DictionaryEntry = 'Articulos_PRECIO_PORTE'
       end
       item
@@ -122,11 +124,14 @@ inherited DataModuleArticulos: TDataModuleArticulos
       item
         Name = 'PRECIO_NETO'
         DataType = datCurrency
+        DisplayLabel = 'Precio neto'
         DictionaryEntry = 'Articulos_PRECIO_NETO'
       end
       item
         Name = 'INVENTARIABLE'
         DataType = datSmallInt
+        DisplayLabel = 'Inventariable'
+        DictionaryEntry = 'Articulos_INVENTARIABLE'
       end
       item
         Name = 'ID_PROVEEDOR'
@@ -144,11 +149,21 @@ inherited DataModuleArticulos: TDataModuleArticulos
         Name = 'ELIMINADO'
         DataType = datSmallInt
         DisplayLabel = 'Eliminado'
+        DictionaryEntry = 'Articulos_ELIMINADO'
       end
       item
         Name = 'FABRICANTE'
         DataType = datString
         Size = 255
+        DisplayLabel = 'Fabricante'
+        DictionaryEntry = 'Articulos_FABRICANTE'
+      end
+      item
+        Name = 'REFERENCIA_FABR'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Ref. fabricante'
+        DictionaryEntry = 'Articulos_REFERENCIA_FABR'
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
@@ -188,6 +203,16 @@ inherited DataModuleArticulos: TDataModuleArticulos
         DataType = datString
         Size = 255
       end
+      item
+        Name = 'FABRICANTE'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'REFERENCIA_FABR'
+        DataType = datString
+        Size = 255
+      end
       item
         Name = 'UNIDAD_MEDIDA'
         DataType = datString
diff --git a/Source/Modulos/Articulos/Model/Articulos_model.dproj b/Source/Modulos/Articulos/Model/Articulos_model.dproj
index de17dbaa..640b74ad 100644
--- a/Source/Modulos/Articulos/Model/Articulos_model.dproj
+++ b/Source/Modulos/Articulos/Model/Articulos_model.dproj
@@ -64,7 +64,7 @@
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
-EurekaLog Version=6006
+EurekaLog Version=6011
 Activate=0
 Activate Handle=1
 Save Log File=1
diff --git a/Source/Modulos/Articulos/Model/Articulos_model.res b/Source/Modulos/Articulos/Model/Articulos_model.res
index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644
GIT binary patch
literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

delta 11
ScmeBCZD5|Duvteife`=|>;pCc

diff --git a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
index 5334a943..0311cafa 100644
--- a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
+++ b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
@@ -3,14 +3,14 @@ unit schArticulosClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_Articulos = '{042A5C28-35B0-4779-B864-11D70E7E1BD5}';
-  RID_ArticulosParaCliente = '{03F3C87A-2A4B-4405-8327-F442AB029B42}';
+  RID_Articulos = '{156CD895-4CAF-4DAD-B780-CE14A9E75C42}';
+  RID_ArticulosParaCliente = '{6EAEF27D-F41C-4537-9818-45A931D61E50}';
 
   { Data table names }
   nme_Articulos = 'Articulos';
@@ -38,6 +38,7 @@ const
   fld_ArticulosNOMBRE_PROVEEDOR = 'NOMBRE_PROVEEDOR';
   fld_ArticulosELIMINADO = 'ELIMINADO';
   fld_ArticulosFABRICANTE = 'FABRICANTE';
+  fld_ArticulosREFERENCIA_FABR = 'REFERENCIA_FABR';
 
   { Articulos field indexes }
   idx_ArticulosID = 0;
@@ -61,6 +62,7 @@ const
   idx_ArticulosNOMBRE_PROVEEDOR = 18;
   idx_ArticulosELIMINADO = 19;
   idx_ArticulosFABRICANTE = 20;
+  idx_ArticulosREFERENCIA_FABR = 21;
 
   { ArticulosParaCliente fields }
   fld_ArticulosParaClienteID = 'ID';
@@ -68,6 +70,7 @@ const
   fld_ArticulosParaClienteREFERENCIA = 'REFERENCIA';
   fld_ArticulosParaClienteDESCRIPCION = 'DESCRIPCION';
   fld_ArticulosParaClienteFABRICANTE = 'FABRICANTE';
+  fld_ArticulosParaClienteREFERENCIA_FABR = 'REFERENCIA_FABR';
   fld_ArticulosParaClienteUNIDAD_MEDIDA = 'UNIDAD_MEDIDA';
   fld_ArticulosParaClienteFAMILIA = 'FAMILIA';
   fld_ArticulosParaClienteIMAGEN = 'IMAGEN';
@@ -91,27 +94,28 @@ const
   idx_ArticulosParaClienteREFERENCIA = 2;
   idx_ArticulosParaClienteDESCRIPCION = 3;
   idx_ArticulosParaClienteFABRICANTE = 4;
-  idx_ArticulosParaClienteUNIDAD_MEDIDA = 5;
-  idx_ArticulosParaClienteFAMILIA = 6;
-  idx_ArticulosParaClienteIMAGEN = 7;
-  idx_ArticulosParaClienteCOMISIONABLE = 8;
-  idx_ArticulosParaClienteFECHA_ALTA = 9;
-  idx_ArticulosParaClienteFECHA_MODIFICACION = 10;
-  idx_ArticulosParaClienteUSUARIO = 11;
-  idx_ArticulosParaClienteREFERENCIA_PROV = 12;
-  idx_ArticulosParaClientePRECIO_COSTE = 13;
-  idx_ArticulosParaClientePRECIO_PORTE = 14;
-  idx_ArticulosParaClienteDESCUENTO = 15;
-  idx_ArticulosParaClientePRECIO_NETO = 16;
-  idx_ArticulosParaClienteINVENTARIABLE = 17;
-  idx_ArticulosParaClienteID_PROVEEDOR = 18;
-  idx_ArticulosParaClienteNOMBRE_PROVEEDOR = 19;
-  idx_ArticulosParaClienteELIMINADO = 20;
+  idx_ArticulosParaClienteREFERENCIA_FABR = 5;
+  idx_ArticulosParaClienteUNIDAD_MEDIDA = 6;
+  idx_ArticulosParaClienteFAMILIA = 7;
+  idx_ArticulosParaClienteIMAGEN = 8;
+  idx_ArticulosParaClienteCOMISIONABLE = 9;
+  idx_ArticulosParaClienteFECHA_ALTA = 10;
+  idx_ArticulosParaClienteFECHA_MODIFICACION = 11;
+  idx_ArticulosParaClienteUSUARIO = 12;
+  idx_ArticulosParaClienteREFERENCIA_PROV = 13;
+  idx_ArticulosParaClientePRECIO_COSTE = 14;
+  idx_ArticulosParaClientePRECIO_PORTE = 15;
+  idx_ArticulosParaClienteDESCUENTO = 16;
+  idx_ArticulosParaClientePRECIO_NETO = 17;
+  idx_ArticulosParaClienteINVENTARIABLE = 18;
+  idx_ArticulosParaClienteID_PROVEEDOR = 19;
+  idx_ArticulosParaClienteNOMBRE_PROVEEDOR = 20;
+  idx_ArticulosParaClienteELIMINADO = 21;
 
 type
   { IArticulos }
   IArticulos = interface(IDAStronglyTypedDataTable)
-  ['{F1DCC683-41C3-4835-A07F-DD9F276298F0}']
+  ['{83F55899-2640-40FA-AED6-7762EA6F1B4B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -196,6 +200,10 @@ type
     procedure SetFABRICANTEValue(const aValue: String);
     function GetFABRICANTEIsNull: Boolean;
     procedure SetFABRICANTEIsNull(const aValue: Boolean);
+    function GetREFERENCIA_FABRValue: String;
+    procedure SetREFERENCIA_FABRValue(const aValue: String);
+    function GetREFERENCIA_FABRIsNull: Boolean;
+    procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -241,10 +249,12 @@ type
     property ELIMINADOIsNull: Boolean read GetELIMINADOIsNull write SetELIMINADOIsNull;
     property FABRICANTE: String read GetFABRICANTEValue write SetFABRICANTEValue;
     property FABRICANTEIsNull: Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull;
+    property REFERENCIA_FABR: String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue;
+    property REFERENCIA_FABRIsNull: Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull;
   end;
 
   { TArticulosDataTableRules }
-  TArticulosDataTableRules = class(TIntfObjectDADataTableRules, IArticulos)
+  TArticulosDataTableRules = class(TDADataTableRules, IArticulos)
   private
     f_IMAGEN: IROStream;
     procedure IMAGEN_OnChange(Sender: TObject);
@@ -333,6 +343,10 @@ type
     procedure SetFABRICANTEValue(const aValue: String); virtual;
     function GetFABRICANTEIsNull: Boolean; virtual;
     procedure SetFABRICANTEIsNull(const aValue: Boolean); virtual;
+    function GetREFERENCIA_FABRValue: String; virtual;
+    procedure SetREFERENCIA_FABRValue(const aValue: String); virtual;
+    function GetREFERENCIA_FABRIsNull: Boolean; virtual;
+    procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -377,6 +391,8 @@ type
     property ELIMINADOIsNull: Boolean read GetELIMINADOIsNull write SetELIMINADOIsNull;
     property FABRICANTE: String read GetFABRICANTEValue write SetFABRICANTEValue;
     property FABRICANTEIsNull: Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull;
+    property REFERENCIA_FABR: String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue;
+    property REFERENCIA_FABRIsNull: Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -386,7 +402,7 @@ type
 
   { IArticulosParaCliente }
   IArticulosParaCliente = interface(IDAStronglyTypedDataTable)
-  ['{5615D828-ACE3-4839-B434-1E1EFC9454E5}']
+  ['{5D392436-9A8E-4D59-ADCB-1C16AEB25EF7}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -408,6 +424,10 @@ type
     procedure SetFABRICANTEValue(const aValue: String);
     function GetFABRICANTEIsNull: Boolean;
     procedure SetFABRICANTEIsNull(const aValue: Boolean);
+    function GetREFERENCIA_FABRValue: String;
+    procedure SetREFERENCIA_FABRValue(const aValue: String);
+    function GetREFERENCIA_FABRIsNull: Boolean;
+    procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean);
     function GetUNIDAD_MEDIDAValue: String;
     procedure SetUNIDAD_MEDIDAValue(const aValue: String);
     function GetUNIDAD_MEDIDAIsNull: Boolean;
@@ -484,6 +504,8 @@ type
     property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
     property FABRICANTE: String read GetFABRICANTEValue write SetFABRICANTEValue;
     property FABRICANTEIsNull: Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull;
+    property REFERENCIA_FABR: String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue;
+    property REFERENCIA_FABRIsNull: Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull;
     property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
     property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
     property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue;
@@ -519,7 +541,7 @@ type
   end;
 
   { TArticulosParaClienteDataTableRules }
-  TArticulosParaClienteDataTableRules = class(TIntfObjectDADataTableRules, IArticulosParaCliente)
+  TArticulosParaClienteDataTableRules = class(TDADataTableRules, IArticulosParaCliente)
   private
     f_IMAGEN: IROStream;
     procedure IMAGEN_OnChange(Sender: TObject);
@@ -545,6 +567,10 @@ type
     procedure SetFABRICANTEValue(const aValue: String); virtual;
     function GetFABRICANTEIsNull: Boolean; virtual;
     procedure SetFABRICANTEIsNull(const aValue: Boolean); virtual;
+    function GetREFERENCIA_FABRValue: String; virtual;
+    procedure SetREFERENCIA_FABRValue(const aValue: String); virtual;
+    function GetREFERENCIA_FABRIsNull: Boolean; virtual;
+    procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); virtual;
     function GetUNIDAD_MEDIDAValue: String; virtual;
     procedure SetUNIDAD_MEDIDAValue(const aValue: String); virtual;
     function GetUNIDAD_MEDIDAIsNull: Boolean; virtual;
@@ -620,6 +646,8 @@ type
     property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
     property FABRICANTE: String read GetFABRICANTEValue write SetFABRICANTEValue;
     property FABRICANTEIsNull: Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull;
+    property REFERENCIA_FABR: String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue;
+    property REFERENCIA_FABRIsNull: Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull;
     property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
     property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
     property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue;
@@ -1126,6 +1154,27 @@ begin
     DataTable.Fields[idx_ArticulosFABRICANTE].AsVariant := Null;
 end;
 
+function TArticulosDataTableRules.GetREFERENCIA_FABRValue: String;
+begin
+  result := DataTable.Fields[idx_ArticulosREFERENCIA_FABR].AsString;
+end;
+
+procedure TArticulosDataTableRules.SetREFERENCIA_FABRValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ArticulosREFERENCIA_FABR].AsString := aValue;
+end;
+
+function TArticulosDataTableRules.GetREFERENCIA_FABRIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ArticulosREFERENCIA_FABR].IsNull;
+end;
+
+procedure TArticulosDataTableRules.SetREFERENCIA_FABRIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ArticulosREFERENCIA_FABR].AsVariant := Null;
+end;
+
 
 { TArticulosParaClienteDataTableRules }
 constructor TArticulosParaClienteDataTableRules.Create(aDataTable: TDADataTable);
@@ -1254,6 +1303,27 @@ begin
     DataTable.Fields[idx_ArticulosParaClienteFABRICANTE].AsVariant := Null;
 end;
 
+function TArticulosParaClienteDataTableRules.GetREFERENCIA_FABRValue: String;
+begin
+  result := DataTable.Fields[idx_ArticulosParaClienteREFERENCIA_FABR].AsString;
+end;
+
+procedure TArticulosParaClienteDataTableRules.SetREFERENCIA_FABRValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ArticulosParaClienteREFERENCIA_FABR].AsString := aValue;
+end;
+
+function TArticulosParaClienteDataTableRules.GetREFERENCIA_FABRIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ArticulosParaClienteREFERENCIA_FABR].IsNull;
+end;
+
+procedure TArticulosParaClienteDataTableRules.SetREFERENCIA_FABRIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ArticulosParaClienteREFERENCIA_FABR].AsVariant := Null;
+end;
+
 function TArticulosParaClienteDataTableRules.GetUNIDAD_MEDIDAValue: String;
 begin
   result := DataTable.Fields[idx_ArticulosParaClienteUNIDAD_MEDIDA].AsString;
diff --git a/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
index 25652198..aabcc217 100644
--- a/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
+++ b/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
@@ -9,13 +9,13 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ArticulosDelta = '{4E74F5A8-5A74-41F9-B8A9-7DF2C8AA2A5A}';
-  RID_ArticulosParaClienteDelta = '{AD7097E1-071E-4496-8F43-216E98BC8F47}';
+  RID_ArticulosDelta = '{FE99E03A-3FCB-4C45-AC72-214C99EA279D}';
+  RID_ArticulosParaClienteDelta = '{56F158DA-2821-4DC3-AF59-B88CD666DD5E}';
 
 type
   { IArticulosDelta }
   IArticulosDelta = interface(IArticulos)
-  ['{4E74F5A8-5A74-41F9-B8A9-7DF2C8AA2A5A}']
+  ['{FE99E03A-3FCB-4C45-AC72-214C99EA279D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -38,6 +38,7 @@ type
     function GetOldNOMBRE_PROVEEDORValue : String;
     function GetOldELIMINADOValue : SmallInt;
     function GetOldFABRICANTEValue : String;
+    function GetOldREFERENCIA_FABRValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -61,6 +62,7 @@ type
     property OldNOMBRE_PROVEEDOR : String read GetOldNOMBRE_PROVEEDORValue;
     property OldELIMINADO : SmallInt read GetOldELIMINADOValue;
     property OldFABRICANTE : String read GetOldFABRICANTEValue;
+    property OldREFERENCIA_FABR : String read GetOldREFERENCIA_FABRValue;
   end;
 
   { TArticulosBusinessProcessorRules }
@@ -195,6 +197,12 @@ type
     function GetOldFABRICANTEIsNull: Boolean; virtual;
     procedure SetFABRICANTEValue(const aValue: String); virtual;
     procedure SetFABRICANTEIsNull(const aValue: Boolean); virtual;
+    function GetREFERENCIA_FABRValue: String; virtual;
+    function GetREFERENCIA_FABRIsNull: Boolean; virtual;
+    function GetOldREFERENCIA_FABRValue: String; virtual;
+    function GetOldREFERENCIA_FABRIsNull: Boolean; virtual;
+    procedure SetREFERENCIA_FABRValue(const aValue: String); virtual;
+    procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -281,6 +289,10 @@ type
     property FABRICANTEIsNull : Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull;
     property OldFABRICANTE : String read GetOldFABRICANTEValue;
     property OldFABRICANTEIsNull : Boolean read GetOldFABRICANTEIsNull;
+    property REFERENCIA_FABR : String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue;
+    property REFERENCIA_FABRIsNull : Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull;
+    property OldREFERENCIA_FABR : String read GetOldREFERENCIA_FABRValue;
+    property OldREFERENCIA_FABRIsNull : Boolean read GetOldREFERENCIA_FABRIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -290,13 +302,14 @@ type
 
   { IArticulosParaClienteDelta }
   IArticulosParaClienteDelta = interface(IArticulosParaCliente)
-  ['{AD7097E1-071E-4496-8F43-216E98BC8F47}']
+  ['{56F158DA-2821-4DC3-AF59-B88CD666DD5E}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
     function GetOldREFERENCIAValue : String;
     function GetOldDESCRIPCIONValue : String;
     function GetOldFABRICANTEValue : String;
+    function GetOldREFERENCIA_FABRValue : String;
     function GetOldUNIDAD_MEDIDAValue : String;
     function GetOldFAMILIAValue : String;
     function GetOldIMAGENValue : IROStream;
@@ -320,6 +333,7 @@ type
     property OldREFERENCIA : String read GetOldREFERENCIAValue;
     property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
     property OldFABRICANTE : String read GetOldFABRICANTEValue;
+    property OldREFERENCIA_FABR : String read GetOldREFERENCIA_FABRValue;
     property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
     property OldFAMILIA : String read GetOldFAMILIAValue;
     property OldIMAGEN : IROStream read GetOldIMAGENValue;
@@ -375,6 +389,12 @@ type
     function GetOldFABRICANTEIsNull: Boolean; virtual;
     procedure SetFABRICANTEValue(const aValue: String); virtual;
     procedure SetFABRICANTEIsNull(const aValue: Boolean); virtual;
+    function GetREFERENCIA_FABRValue: String; virtual;
+    function GetREFERENCIA_FABRIsNull: Boolean; virtual;
+    function GetOldREFERENCIA_FABRValue: String; virtual;
+    function GetOldREFERENCIA_FABRIsNull: Boolean; virtual;
+    procedure SetREFERENCIA_FABRValue(const aValue: String); virtual;
+    procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); virtual;
     function GetUNIDAD_MEDIDAValue: String; virtual;
     function GetUNIDAD_MEDIDAIsNull: Boolean; virtual;
     function GetOldUNIDAD_MEDIDAValue: String; virtual;
@@ -492,6 +512,10 @@ type
     property FABRICANTEIsNull : Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull;
     property OldFABRICANTE : String read GetOldFABRICANTEValue;
     property OldFABRICANTEIsNull : Boolean read GetOldFABRICANTEIsNull;
+    property REFERENCIA_FABR : String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue;
+    property REFERENCIA_FABRIsNull : Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull;
+    property OldREFERENCIA_FABR : String read GetOldREFERENCIA_FABRValue;
+    property OldREFERENCIA_FABRIsNull : Boolean read GetOldREFERENCIA_FABRIsNull;
     property UNIDAD_MEDIDA : String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
     property UNIDAD_MEDIDAIsNull : Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
     property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
@@ -1242,6 +1266,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosFABRICANTE] := Null;
 end;
 
+function TArticulosBusinessProcessorRules.GetREFERENCIA_FABRValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosREFERENCIA_FABR];
+end;
+
+function TArticulosBusinessProcessorRules.GetREFERENCIA_FABRIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosREFERENCIA_FABR]);
+end;
+
+function TArticulosBusinessProcessorRules.GetOldREFERENCIA_FABRValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosREFERENCIA_FABR];
+end;
+
+function TArticulosBusinessProcessorRules.GetOldREFERENCIA_FABRIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosREFERENCIA_FABR]);
+end;
+
+procedure TArticulosBusinessProcessorRules.SetREFERENCIA_FABRValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosREFERENCIA_FABR] := aValue;
+end;
+
+procedure TArticulosBusinessProcessorRules.SetREFERENCIA_FABRIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosREFERENCIA_FABR] := Null;
+end;
+
 
 { TArticulosParaClienteBusinessProcessorRules }
 constructor TArticulosParaClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
@@ -1420,6 +1475,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteFABRICANTE] := Null;
 end;
 
+function TArticulosParaClienteBusinessProcessorRules.GetREFERENCIA_FABRValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteREFERENCIA_FABR];
+end;
+
+function TArticulosParaClienteBusinessProcessorRules.GetREFERENCIA_FABRIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteREFERENCIA_FABR]);
+end;
+
+function TArticulosParaClienteBusinessProcessorRules.GetOldREFERENCIA_FABRValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteREFERENCIA_FABR];
+end;
+
+function TArticulosParaClienteBusinessProcessorRules.GetOldREFERENCIA_FABRIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteREFERENCIA_FABR]);
+end;
+
+procedure TArticulosParaClienteBusinessProcessorRules.SetREFERENCIA_FABRValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteREFERENCIA_FABR] := aValue;
+end;
+
+procedure TArticulosParaClienteBusinessProcessorRules.SetREFERENCIA_FABRIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteREFERENCIA_FABR] := Null;
+end;
+
 function TArticulosParaClienteBusinessProcessorRules.GetUNIDAD_MEDIDAValue: String;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteUNIDAD_MEDIDA];
diff --git a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
index 9ad6feda..af19aea0 100644
--- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
+++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
@@ -76,7 +76,7 @@ object srvArticulos: TsrvArticulos
       item
         Name = 'Articulos_PRECIO_PORTE'
         DataType = datCurrency
-        DisplayLabel = 'Porte'
+        DisplayLabel = 'Precio porte'
       end
       item
         Name = 'Articulos_DESCUENTO'
@@ -99,7 +99,7 @@ object srvArticulos: TsrvArticulos
       item
         Name = 'Articulos_PRECIO_NETO'
         DataType = datCurrency
-        DisplayLabel = 'PRECIO_NETO'
+        DisplayLabel = 'Precio neto'
       end
       item
         Name = 'Articulos_ID_PROVEEDOR'
@@ -113,6 +113,34 @@ object srvArticulos: TsrvArticulos
         Size = 255
         DisplayLabel = 'Nombre'
         ServerAutoRefresh = True
+      end
+      item
+        Name = 'Articulos_UNIDAD_MEDIDA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Unidad de medida'
+      end
+      item
+        Name = 'Articulos_INVENTARIABLE'
+        DataType = datSmallInt
+        DisplayLabel = 'Inventariable'
+      end
+      item
+        Name = 'Articulos_ELIMINADO'
+        DataType = datSmallInt
+        DisplayLabel = 'Eliminado'
+      end
+      item
+        Name = 'Articulos_FABRICANTE'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Fabricante'
+      end
+      item
+        Name = 'Articulos_REFERENCIA_FABR'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Ref. fabricante'
       end>
     Left = 150
     Top = 22
@@ -213,6 +241,10 @@ object srvArticulos: TsrvArticulos
               item
                 DatasetField = 'FABRICANTE'
                 TableField = 'FABRICANTE'
+              end
+              item
+                DatasetField = 'REFERENCIA_FABR'
+                TableField = 'REFERENCIA_FABR'
               end>
           end>
         Name = 'Articulos'
@@ -246,6 +278,7 @@ object srvArticulos: TsrvArticulos
             Name = 'UNIDAD_MEDIDA'
             DataType = datString
             Size = 255
+            DictionaryEntry = 'Articulos_UNIDAD_MEDIDA'
           end
           item
             Name = 'FAMILIA'
@@ -308,6 +341,7 @@ object srvArticulos: TsrvArticulos
           item
             Name = 'INVENTARIABLE'
             DataType = datSmallInt
+            DictionaryEntry = 'Articulos_INVENTARIABLE'
           end
           item
             Name = 'ID_PROVEEDOR'
@@ -323,12 +357,19 @@ object srvArticulos: TsrvArticulos
           item
             Name = 'ELIMINADO'
             DataType = datSmallInt
-            DisplayLabel = 'Eliminado'
+            DictionaryEntry = 'Articulos_ELIMINADO'
           end
           item
             Name = 'FABRICANTE'
             DataType = datString
             Size = 255
+            DictionaryEntry = 'Articulos_FABRICANTE'
+          end
+          item
+            Name = 'REFERENCIA_FABR'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Articulos_REFERENCIA_FABR'
           end>
       end
       item
@@ -345,18 +386,18 @@ object srvArticulos: TsrvArticulos
             SQL = 
               'SELECT V_ARTICULOS.ID, V_ARTICULOS.ID_EMPRESA, V_ARTICULOS.REFER' +
               'ENCIA, V_ARTICULOS.DESCRIPCION,'#10'       V_ARTICULOS.FABRICANTE,'#10' ' +
-              '      V_ARTICULOS.UNIDAD_MEDIDA,'#10'       V_ARTICULOS.FAMILIA, V_A' +
-              'RTICULOS.IMAGEN, V_ARTICULOS.COMISIONABLE, V_ARTICULOS.FECHA_ALT' +
-              'A,'#10'       V_ARTICULOS.FECHA_MODIFICACION, V_ARTICULOS.USUARIO,'#10' ' +
-              '      V_ARTICULOS.REFERENCIA_PROV,'#10'       V_ARTICULOS.PRECIO_COS' +
-              'TE,'#10'       V_ARTICULOS.PRECIO_PORTE,'#10'       CLIENTES_DTOS_PROVEE' +
-              'DORES.DESCUENTO,'#10'       V_ARTICULOS.PRECIO_NETO,'#10'       V_ARTICU' +
-              'LOS.INVENTARIABLE,'#10'       V_ARTICULOS.ID_PROVEEDOR,'#10'       V_ART' +
-              'ICULOS.NOMBRE_PROVEEDOR,'#10'       V_ARTICULOS.ELIMINADO'#10'FROM V_ART' +
-              'ICULOS'#10'LEFT OUTER JOIN CLIENTES_DTOS_PROVEEDORES'#10'ON ((CLIENTES_D' +
-              'TOS_PROVEEDORES.ID_PROVEEDOR = V_ARTICULOS.ID_PROVEEDOR)'#10'AND (CL' +
-              'IENTES_DTOS_PROVEEDORES.ID_CLIENTE = :ID_CLIENTE))'#10'where {where}' +
-              #10
+              '      V_ARTICULOS.REFERENCIA_FABR,'#10'       V_ARTICULOS.UNIDAD_MED' +
+              'IDA,'#10'       V_ARTICULOS.FAMILIA, V_ARTICULOS.IMAGEN, V_ARTICULOS' +
+              '.COMISIONABLE, V_ARTICULOS.FECHA_ALTA,'#10'       V_ARTICULOS.FECHA_' +
+              'MODIFICACION, V_ARTICULOS.USUARIO,'#10'       V_ARTICULOS.REFERENCIA' +
+              '_PROV,'#10'       V_ARTICULOS.PRECIO_COSTE,'#10'       V_ARTICULOS.PRECI' +
+              'O_PORTE,'#10'       CLIENTES_DTOS_PROVEEDORES.DESCUENTO,'#10'       V_AR' +
+              'TICULOS.PRECIO_NETO,'#10'       V_ARTICULOS.INVENTARIABLE,'#10'       V_' +
+              'ARTICULOS.ID_PROVEEDOR,'#10'       V_ARTICULOS.NOMBRE_PROVEEDOR,'#10'   ' +
+              '    V_ARTICULOS.ELIMINADO'#10'FROM V_ARTICULOS'#10'LEFT OUTER JOIN CLIEN' +
+              'TES_DTOS_PROVEEDORES'#10'ON ((CLIENTES_DTOS_PROVEEDORES.ID_PROVEEDOR' +
+              ' = V_ARTICULOS.ID_PROVEEDOR)'#10'AND (CLIENTES_DTOS_PROVEEDORES.ID_C' +
+              'LIENTE = :ID_CLIENTE))'#10'where {where}'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -443,6 +484,10 @@ object srvArticulos: TsrvArticulos
               item
                 DatasetField = 'FABRICANTE'
                 TableField = 'FABRICANTE'
+              end
+              item
+                DatasetField = 'REFERENCIA_FABR'
+                TableField = 'REFERENCIA_FABR'
               end>
           end>
         Name = 'ArticulosParaCliente'
@@ -471,6 +516,11 @@ object srvArticulos: TsrvArticulos
             DataType = datString
             Size = 255
           end
+          item
+            Name = 'REFERENCIA_FABR'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'UNIDAD_MEDIDA'
             DataType = datString
@@ -549,8 +599,6 @@ object srvArticulos: TsrvArticulos
         Params = <
           item
             Name = 'ID'
-            DataType = datAutoInc
-            GeneratorName = 'GEN_ARTICULOS_ID'
             Value = ''
           end
           item
@@ -628,6 +676,10 @@ object srvArticulos: TsrvArticulos
           item
             Name = 'FABRICANTE'
             Value = ''
+          end
+          item
+            Name = 'REFERENCIA_FABR'
+            Value = ''
           end>
         Statements = <
           item
@@ -638,12 +690,12 @@ object srvArticulos: TsrvArticulos
               'CION, UNIDAD_MEDIDA, FAMILIA, IMAGEN,'#10'     COMISIONABLE, FECHA_A' +
               'LTA, FECHA_MODIFICACION, USUARIO, '#10'     PRECIO_COSTE, PRECIO_POR' +
               'TE, DESCUENTO, ID_PROVEEDOR, '#10'     PRECIO_NETO, REFERENCIA_PROV,' +
-              ' INVENTARIABLE, ELIMINADO, FABRICANTE)'#10'  VALUES'#10'    (:ID, :ID_EM' +
-              'PRESA, :REFERENCIA, :DESCRIPCION, :UNIDAD_MEDIDA, :FAMILIA,'#10'    ' +
-              ' :IMAGEN, :COMISIONABLE, :FECHA_ALTA, :FECHA_MODIFICACION, '#10'    ' +
-              ' :USUARIO, :PRECIO_COSTE, :PRECIO_PORTE, :DESCUENTO, '#10'     :ID_P' +
-              'ROVEEDOR, :PRECIO_NETO, :REFERENCIA_PROV,'#10'     :INVENTARIABLE, :' +
-              'ELIMINADO, :FABRICANTE)'#10
+              ' INVENTARIABLE, ELIMINADO, FABRICANTE,'#10'     REFERENCIA_FABR)'#10'  V' +
+              'ALUES'#10'    (:ID, :ID_EMPRESA, :REFERENCIA, :DESCRIPCION, :UNIDAD_' +
+              'MEDIDA, :FAMILIA,'#10'     :IMAGEN, :COMISIONABLE, :FECHA_ALTA, :FEC' +
+              'HA_MODIFICACION, '#10'     :USUARIO, :PRECIO_COSTE, :PRECIO_PORTE, :' +
+              'DESCUENTO, '#10'     :ID_PROVEEDOR, :PRECIO_NETO, :REFERENCIA_PROV,'#10 +
+              '     :INVENTARIABLE, :ELIMINADO, :FABRICANTE, :REFERENCIA_FABR)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -745,6 +797,10 @@ object srvArticulos: TsrvArticulos
             Name = 'FABRICANTE'
             Value = ''
           end
+          item
+            Name = 'REFERENCIA_FABR'
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -763,8 +819,9 @@ object srvArticulos: TsrvArticulos
               'O_PORTE = :PRECIO_PORTE, '#10'    DESCUENTO = :DESCUENTO, '#10'    ID_PR' +
               'OVEEDOR = :ID_PROVEEDOR, '#10'    PRECIO_NETO = :PRECIO_NETO,'#10'    IN' +
               'VENTARIABLE = :INVENTARIABLE,'#10'    REFERENCIA_PROV = :REFERENCIA_' +
-              'PROV,'#10'    ELIMINADO = :ELIMINADO,'#10'    FABRICANTE = :FABRICANTE'#10' ' +
-              ' WHERE'#10'    (ID = :OLD_ID)'#10
+              'PROV,'#10'    ELIMINADO = :ELIMINADO,'#10'    FABRICANTE = :FABRICANTE,'#10 +
+              '    REFERENCIA_FABR = :REFERENCIA_FABR'#10'  WHERE'#10'    (ID = :OLD_ID' +
+              ')'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.res b/Source/Modulos/Articulos/Views/Articulos_view.res
index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644
GIT binary patch
delta 11
ScmeBCZD5|Duvteife`=|>;pCc

literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

diff --git a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
index a6c56ae6..2b39f676 100644
--- a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
@@ -48,8 +48,10 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
   inherited TBXDock: TTBXDock
     Top = 87
     Width = 656
+    Height = 49
     ExplicitTop = 87
     ExplicitWidth = 656
+    ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
       Align = alLeft
       DockPos = -6
@@ -85,6 +87,14 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
     inherited tbxMenu: TTBXToolbar
       ExplicitWidth = 656
     end
+    inherited TBXTMain2: TTBXToolbar
+      Left = 395
+      Top = 23
+      DockPos = 395
+      DockRow = 1
+      ExplicitLeft = 395
+      ExplicitTop = 23
+    end
   end
   inherited StatusBar: TJvStatusBar
     Width = 656
diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
index 16c06bf1..36498b38 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
@@ -1,6 +1,6 @@
 inherited frViewArticulo: TfrViewArticulo
-  Width = 649
-  Height = 426
+  Width = 986
+  Height = 439
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -10,19 +10,18 @@ inherited frViewArticulo: TfrViewArticulo
   object dxLayoutControlArticulo: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 649
-    Height = 393
+    Width = 986
+    Height = 425
     Align = alTop
     ParentBackground = True
     TabOrder = 0
     AutoContentSizes = [acsWidth]
-    ExplicitWidth = 451
     DesignSize = (
-      649
-      393)
+      986
+      425)
     object PngSpeedButton2: TPngSpeedButton
-      Left = 588
-      Top = 28
+      Left = 506
+      Top = 304
       Width = 23
       Height = 22
       Action = actAnadir
@@ -48,22 +47,22 @@ inherited frViewArticulo: TfrViewArticulo
       PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
     end
     object PngSpeedButton1: TPngSpeedButton
-      Left = 588
-      Top = 56
+      Left = 506
+      Top = 332
       Width = 23
       Height = 22
       Action = actEliminar
       PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
     end
     object eReferencia: TcxDBTextEdit
-      Left = 103
-      Top = 28
+      Left = 122
+      Top = 55
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'REFERENCIA'
       DataBinding.DataSource = dsViewArticulo
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
-      Style.Color = 14745599
+      Style.Color = clWindow
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
@@ -73,12 +72,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 0
+      TabOrder = 1
       Width = 164
     end
     object eDescripcion: TcxDBTextEdit
-      Left = 103
-      Top = 55
+      Left = 122
+      Top = 28
       DataBinding.DataField = 'DESCRIPCION'
       DataBinding.DataSource = dsViewArticulo
       Style.BorderColor = clWindowFrame
@@ -93,12 +92,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 1
-      Width = 108
+      TabOrder = 0
+      Width = 132
     end
     object eNoComisionable: TcxDBCheckBox
-      Left = 103
-      Top = 136
+      Left = 122
+      Top = 163
       Caption = 'Art'#237'culo no comisionable'
       DataBinding.DataField = 'COMISIONABLE'
       DataBinding.DataSource = dsViewArticulo
@@ -121,8 +120,8 @@ inherited frViewArticulo: TfrViewArticulo
       Width = 144
     end
     object eImagen: TcxImage
-      Left = 468
-      Top = 28
+      Left = 28
+      Top = 304
       Properties.GraphicClassName = 'TJPEGImage'
       Properties.ImmediatePost = True
       Properties.PopupMenuLayout.MenuItems = []
@@ -138,12 +137,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
-      Height = 100
-      Width = 140
+      TabOrder = 8
+      Height = 98
+      Width = 621
     end
     object cbFamilia: TcxDBComboBox
-      Left = 103
+      Left = 122
       Top = 82
       DataBinding.DataField = 'FAMILIA'
       DataBinding.DataSource = dsViewArticulo
@@ -164,12 +163,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 2
-      Width = 162
+      Width = 383
     end
     inline frViewDatosYSeleccionProveedor1: TfrViewDatosYSeleccionProveedor
-      Left = 261
-      Top = 193
-      Width = 350
+      Left = 559
+      Top = 28
+      Width = 526
       Height = 202
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
@@ -177,32 +176,42 @@ inherited frViewArticulo: TfrViewArticulo
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 13
+      TabOrder = 9
       ReadOnly = False
-      ExplicitLeft = 261
-      ExplicitTop = 193
+      ExplicitLeft = 559
+      ExplicitTop = 28
+      ExplicitWidth = 526
       inherited dxLayoutControl1: TdxLayoutControl
+        Width = 526
         inherited edtNIFCIF: TcxDBTextEdit
           ExplicitWidth = 562
           Width = 562
         end
         inherited edtCalle: TcxDBTextEdit
-          ExplicitWidth = 562
-          Width = 562
+          ExplicitWidth = 113
+          Width = 113
         end
         inherited edtPoblacion: TcxDBTextEdit
-          ExplicitWidth = 177
-          Width = 177
+          ExplicitWidth = 49
+          Width = 49
         end
         inherited edtProvincia: TcxDBTextEdit
           ExplicitWidth = 327
           Width = 327
         end
+        inherited edtCodigoPostal: TcxDBTextEdit
+          Left = 313
+          ExplicitLeft = 313
+        end
+        inherited Button3: TBitBtn
+          Left = 197
+          ExplicitLeft = 197
+        end
       end
     end
     object eReferenciaProv: TcxDBTextEdit
-      Left = 103
-      Top = 193
+      Left = 640
+      Top = 266
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'REFERENCIA_PROV'
       DataBinding.DataSource = dsViewArticulo
@@ -214,12 +223,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
-      Width = 86
+      TabOrder = 10
+      Width = 164
     end
     object ePrecioCoste: TcxDBCurrencyEdit
-      Left = 103
-      Top = 220
+      Left = 640
+      Top = 293
       DataBinding.DataField = 'PRECIO_COSTE'
       DataBinding.DataSource = dsViewArticulo
       Properties.Alignment.Horz = taRightJustify
@@ -234,12 +243,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
-      Width = 86
+      TabOrder = 11
+      Width = 176
     end
     object eDescuento: TcxDBSpinEdit
-      Left = 103
-      Top = 247
+      Left = 640
+      Top = 320
       DataBinding.DataField = 'DESCUENTO'
       DataBinding.DataSource = dsViewArticulo
       Properties.Alignment.Horz = taRightJustify
@@ -257,12 +266,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 10
-      Width = 86
+      TabOrder = 12
+      Width = 120
     end
     object ePrecioNeto: TcxDBCurrencyEdit
-      Left = 103
-      Top = 274
+      Left = 640
+      Top = 347
       DataBinding.DataField = 'PRECIO_NETO'
       DataBinding.DataSource = dsViewArticulo
       Enabled = False
@@ -282,12 +291,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.TextColor = clWindowText
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 11
-      Width = 86
+      TabOrder = 13
+      Width = 152
     end
     object ePrecioPorte: TcxDBCurrencyEdit
-      Left = 103
-      Top = 301
+      Left = 640
+      Top = 374
       DataBinding.DataField = 'PRECIO_PORTE'
       DataBinding.DataSource = dsViewArticulo
       Properties.Alignment.Horz = taRightJustify
@@ -302,12 +311,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 12
-      Width = 86
+      TabOrder = 14
+      Width = 152
     end
     object cbNoInventariable: TcxDBCheckBox
-      Left = 253
-      Top = 109
+      Left = 122
+      Top = 136
       Caption = 'Art'#237'culo no inventariable'
       DataBinding.DataField = 'INVENTARIABLE'
       DataBinding.DataSource = dsViewArticulo
@@ -326,12 +335,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 6
-      Width = 144
+      TabOrder = 4
+      Width = 148
     end
     object cbUnidadMedida: TcxDBComboBox
-      Left = 307
-      Top = 82
+      Left = 122
+      Top = 109
       DataBinding.DataField = 'UNIDAD_MEDIDA'
       DataBinding.DataSource = dsViewArticulo
       Properties.DropDownRows = 16
@@ -351,11 +360,11 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 3
-      Width = 164
+      Width = 511
     end
     object cbFabricante: TcxDBComboBox
-      Left = 103
-      Top = 109
+      Left = 122
+      Top = 220
       DataBinding.DataField = 'FABRICANTE'
       DataBinding.DataSource = dsViewArticulo
       Properties.DropDownRows = 16
@@ -374,23 +383,60 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 4
-      Width = 127
+      TabOrder = 6
+      Width = 479
+    end
+    object eReferenciaFabr: TcxDBTextEdit
+      Left = 122
+      Top = 247
+      Anchors = [akLeft, akTop, akRight]
+      DataBinding.DataField = 'REFERENCIA_FABR'
+      DataBinding.DataSource = dsViewArticulo
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Color = clWindow
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.Color = clWindow
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 7
+      Width = 171
     end
     object dxLayoutControlArticuloGroup_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
+      LayoutDirection = ldHorizontal
       ShowBorder = False
-      object dxLayoutControlArticuloGroup7: TdxLayoutGroup
+      object dxLayoutControlArticuloGroup3: TdxLayoutGroup
+        Caption = 'New Group'
+        ShowCaption = False
+        LayoutDirection = ldHorizontal
+        ShowBorder = False
+      end
+      object dxLayoutControlArticuloGroup14: TdxLayoutGroup
+        AutoAligns = []
+        AlignHorz = ahClient
+        Caption = 'New Group'
         ShowCaption = False
         Hidden = True
-        LayoutDirection = ldHorizontal
         ShowBorder = False
         object dxLayoutControlArticuloGroup1: TdxLayoutGroup
           AutoAligns = []
           AlignHorz = ahClient
-          AlignVert = avClient
           Caption = 'Datos del art'#237'culo'
+          object dxLayoutControlArticuloItem8: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = 'Descripci'#243'n:'
+            Control = eDescripcion
+            ControlOptions.ShowBorder = False
+          end
           object dxLayoutControlArticuloItem3: TdxLayoutItem
             AutoAligns = [aaVertical]
             AlignHorz = ahClient
@@ -402,76 +448,59 @@ inherited frViewArticulo: TfrViewArticulo
             ShowCaption = False
             Hidden = True
             ShowBorder = False
-            object dxLayoutControlArticuloItem8: TdxLayoutItem
+            object dxLayoutControlArticuloItem4: TdxLayoutItem
               AutoAligns = [aaVertical]
               AlignHorz = ahClient
-              Caption = 'Descripci'#243'n:'
-              Control = eDescripcion
+              Caption = 'Familia:'
+              Control = cbFamilia
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControlArticuloItem9: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Unidad de medida:'
+              Control = cbUnidadMedida
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControlArticuloGroup6: TdxLayoutGroup
               ShowCaption = False
               Hidden = True
               ShowBorder = False
-              object dxLayoutControlArticuloGroup9: TdxLayoutGroup
-                ShowCaption = False
-                Hidden = True
-                LayoutDirection = ldHorizontal
-                ShowBorder = False
-                object dxLayoutControlArticuloItem4: TdxLayoutItem
-                  AutoAligns = [aaVertical]
-                  AlignHorz = ahClient
-                  Caption = 'Familia:'
-                  Control = cbFamilia
-                  ControlOptions.ShowBorder = False
-                end
-                object dxLayoutControlArticuloItem9: TdxLayoutItem
-                  AutoAligns = [aaVertical]
-                  AlignHorz = ahClient
-                  Caption = 'Unid. medida:'
-                  Control = cbUnidadMedida
-                  ControlOptions.ShowBorder = False
-                end
+              object dxLayoutControlArticuloItem7: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Caption = ' '
+                Control = cbNoInventariable
+                ControlOptions.ShowBorder = False
               end
-              object dxLayoutControlArticuloGroup8: TdxLayoutGroup
-                ShowCaption = False
-                Hidden = True
-                LayoutDirection = ldHorizontal
-                ShowBorder = False
-                object dxLayoutControlArticuloGroup10: TdxLayoutGroup
-                  ShowCaption = False
-                  Hidden = True
-                  ShowBorder = False
-                  object dxLayoutControlArticuloItem10: TdxLayoutItem
-                    Caption = 'Fabricante:'
-                    Control = cbFabricante
-                    ControlOptions.ShowBorder = False
-                  end
-                  object dxLayoutControlArticuloItem1: TdxLayoutItem
-                    AutoAligns = [aaVertical]
-                    AlignHorz = ahClient
-                    Caption = ' '
-                    Visible = False
-                    Control = eNoComisionable
-                    ControlOptions.ShowBorder = False
-                  end
-                end
-                object dxLayoutControlArticuloItem7: TdxLayoutItem
-                  AutoAligns = [aaVertical]
-                  AlignHorz = ahClient
-                  Caption = ' '
-                  ShowCaption = False
-                  Control = cbNoInventariable
-                  ControlOptions.ShowBorder = False
-                end
+              object dxLayoutControlArticuloItem1: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Caption = ' '
+                Visible = False
+                Control = eNoComisionable
+                ControlOptions.ShowBorder = False
               end
             end
           end
         end
+        object dxLayoutControlArticuloGroup10: TdxLayoutGroup
+          Caption = 'Datos del fabricante'
+          object dxLayoutControlArticuloItem10: TdxLayoutItem
+            Caption = 'Fabricante:'
+            Control = cbFabricante
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControlArticuloItem11: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            Caption = 'Referencia:'
+            Control = eReferenciaFabr
+            ControlOptions.ShowBorder = False
+          end
+        end
         object dxLayoutControlArticuloGroup2: TdxLayoutGroup
           AutoAligns = []
           AlignHorz = ahClient
-          AlignVert = avClient
           Caption = 'Imagen'
           Visible = False
           LayoutDirection = ldHorizontal
@@ -501,14 +530,25 @@ inherited frViewArticulo: TfrViewArticulo
           end
         end
       end
-      object dxLayoutControlArticuloGroup3: TdxLayoutGroup
-        Caption = 'New Group'
+      object dxLayoutControlArticuloGroup7: TdxLayoutGroup
+        AutoAligns = [aaVertical]
+        AlignHorz = ahClient
         ShowCaption = False
-        LayoutDirection = ldHorizontal
+        Hidden = True
         ShowBorder = False
-        object dxLayoutControlArticuloGroup11: TdxLayoutGroup
+        object dxLayoutControlArticuloGroup12: TdxLayoutGroup
           AutoAligns = [aaVertical]
           AlignHorz = ahClient
+          Caption = 'Proveedor para el art'#237'culo'
+          object dxLayoutControlArticuloItem14: TdxLayoutItem
+            Control = frViewDatosYSeleccionProveedor1
+            ControlOptions.AutoColor = True
+            ControlOptions.ShowBorder = False
+          end
+        end
+        object dxLayoutControlArticuloGroup11: TdxLayoutGroup
+          AutoAligns = []
+          AlignHorz = ahClient
           Caption = 'Datos del proveedor para el art'#237'culo'
           object dxLayoutControlArticuloItem15: TdxLayoutItem
             Caption = 'Ref. del prov:'
@@ -536,16 +576,6 @@ inherited frViewArticulo: TfrViewArticulo
             ControlOptions.ShowBorder = False
           end
         end
-        object dxLayoutControlArticuloGroup12: TdxLayoutGroup
-          AutoAligns = [aaVertical]
-          AlignHorz = ahRight
-          Caption = 'Proveedor para el art'#237'culo'
-          object dxLayoutControlArticuloItem14: TdxLayoutItem
-            Control = frViewDatosYSeleccionProveedor1
-            ControlOptions.AutoColor = True
-            ControlOptions.ShowBorder = False
-          end
-        end
       end
     end
   end
diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.pas b/Source/Modulos/Articulos/Views/uViewArticulo.pas
index 8872c8cf..89f3b546 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulo.pas
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.pas
@@ -47,7 +47,6 @@ type
     dxLayoutControlArticuloItem5: TdxLayoutItem;
     PngSpeedButton1: TPngSpeedButton;
     dxLayoutControlArticuloGroup3: TdxLayoutGroup;
-    dxLayoutControlArticuloGroup7: TdxLayoutGroup;
     eImagen: TcxImage;
     dxLayoutControlArticuloItem6: TdxLayoutItem;
     dxLayoutControlArticuloGroup5: TdxLayoutGroup;
@@ -70,13 +69,15 @@ type
     dxLayoutControlArticuloGroup12: TdxLayoutGroup;
     dxLayoutControlArticuloItem7: TdxLayoutItem;
     cbNoInventariable: TcxDBCheckBox;
-    dxLayoutControlArticuloGroup8: TdxLayoutGroup;
     dxLayoutControlArticuloItem9: TdxLayoutItem;
     cbUnidadMedida: TcxDBComboBox;
-    dxLayoutControlArticuloGroup9: TdxLayoutGroup;
     dxLayoutControlArticuloItem10: TdxLayoutItem;
     cbFabricante: TcxDBComboBox;
+    dxLayoutControlArticuloItem11: TdxLayoutItem;
+    eReferenciaFabr: TcxDBTextEdit;
     dxLayoutControlArticuloGroup10: TdxLayoutGroup;
+    dxLayoutControlArticuloGroup14: TdxLayoutGroup;
+    dxLayoutControlArticuloGroup7: TdxLayoutGroup;
     procedure actEliminarExecute(Sender: TObject);
     procedure actAnadirExecute(Sender: TObject);
     procedure cbFamiliaPropertiesInitPopup(Sender: TObject);