Fixes
Merge branch 'master' of github.com:masterinho52/OrtXla into JFAM

Conflicts:
	ortoxela/FacturaTemporal/IngresarFacturas.Designer.cs
	ortoxela/FacturaTemporal/IngresarFacturas.cs
	ortoxela/Pedido/frm_pedido.designer.cs
Cambios Entrega 22-02-2014
Merge branch 'JFAM' of github.com:masterinho52/OrtXla

Conflicts:
	ortoxela/Pedido/frm_pedido.designer.cs
commit 2014 02 22