entradas de almacen parte1
Merge branch 'master' of https://github.com/excelmaster/MediBio_inventory

Conflicts:
	Clientes_mant.ccp
	Clientes_mant.html
	Clientes_mant.php
	Clientes_mant_events.php
	Common.php
	Connection1_DataDictionary.xml
	Styles/Blueprint/Images/en/ButtonSearch.gif
	Styles/Blueprint/Images/en/ButtonUpdate.gif
	Styles/None/Images/en/ButtonSearch.gif
	Styles/None/Images/en/ButtonUpdate.gif
	bdBone/invent_mb_backup_20130615-0936.sql
	connection1_cache.xml
	en.txt
	invt_alternativo.ccs
	productos_mant.ccp
	productos_mant.html
	productos_mant.php
	rpt_productos.ccp
	rpt_productos.html
	rpt_productos.php
	rpt_productos_events.php