borrando assets
Merge branch 'mod-inventarios' of https://github.com/juan1510/siasoft_v2 into juan1510-mod-inventarios

Conflicts:
	.gitignore
	assets/11c90d86/error.png
	assets/11c90d86/noError.png
	assets/11c90d86/process-working.gif
	assets/11c90d86/srbac.css
	assets/18b10b54/css/bootstrap-responsive.min.css
	assets/18b10b54/css/bootstrap-yii.css
	assets/18b10b54/img/glyphicons-halflings-white.png
	assets/18b10b54/img/glyphicons-halflings.png
	assets/18b10b54/img/loading.gif
	assets/18b10b54/js/bootstrap.min.js
	assets/1acac3f5/gridview/bg.gif
	assets/1acac3f5/gridview/delete.png
	assets/1acac3f5/gridview/down.gif
	assets/1acac3f5/gridview/loading.gif
	assets/1acac3f5/gridview/up.gif
	assets/1acac3f5/gridview/update.png
	assets/1acac3f5/gridview/view.png
	assets/1acac3f5/listview/down.gif
	assets/1acac3f5/listview/loading.gif
	assets/1acac3f5/listview/up.gif
	assets/27a58471/autocomplete/indicator.gif
	assets/27a58471/jquery.ajaxqueue.js
	assets/27a58471/jquery.multifile.js
	assets/27a58471/jquery.rating.js
	assets/27a58471/jquery.treeview.async.js
	assets/27a58471/jui/css/base/images/ui-bg_flat_0_aaaaaa_40x100.png
	assets/27a58471/jui/css/base/images/ui-bg_flat_75_ffffff_40x100.png
	assets/27a58471/jui/css/base/images/ui-bg_glass_55_fbf9ee_1x400.png
	assets/27a58471/jui/css/base/images/ui-bg_glass_65_ffffff_1x400.png
	assets/27a58471/jui/css/base/images/ui-bg_glass_75_dadada_1x400.png
	assets/27a58471/jui/css/base/images/ui-bg_glass_75_e6e6e6_1x400.png
	assets/27a58471/jui/css/base/images/ui-bg_glass_95_fef1ec_1x400.png
	assets/27a58471/jui/css/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	assets/27a58471/jui/css/base/images/ui-icons_222222_256x240.png
	assets/27a58471/jui/css/base/images/ui-icons_2e83ff_256x240.png
	assets/27a58471/jui/css/base/images/ui-icons_454545_256x240.png
	assets/27a58471/jui/css/base/images/ui-icons_888888_256x240.png
	assets/27a58471/jui/css/base/images/ui-icons_cd0a0a_256x240.png
	assets/27a58471/rating/delete.gif
	assets/27a58471/rating/jquery.rating.css
	assets/27a58471/rating/star.gif
	assets/27a58471/treeview/images/ajax-loader.gif
	assets/27a58471/treeview/images/file.gif
	assets/27a58471/treeview/images/folder-closed.gif
	assets/27a58471/treeview/images/folder.gif
	assets/27a58471/treeview/images/minus.gif
	assets/27a58471/treeview/images/plus.gif
	assets/27a58471/treeview/images/treeview-black-line.gif
	assets/27a58471/treeview/images/treeview-black.gif
	assets/27a58471/treeview/images/treeview-default-line.gif
	assets/27a58471/treeview/images/treeview-default.gif
	assets/27a58471/treeview/images/treeview-famfamfam-line.gif
	assets/27a58471/treeview/images/treeview-famfamfam.gif
	assets/27a58471/treeview/images/treeview-gray-line.gif
	assets/27a58471/treeview/images/treeview-gray.gif
	assets/27a58471/treeview/images/treeview-red-line.gif
	assets/27a58471/treeview/images/treeview-red.gif
	assets/27a58471/treeview/jquery.treeview.css
	assets/2886b8bb/admin.png
	assets/2886b8bb/allow.png
	assets/2886b8bb/create.png
	assets/2886b8bb/delete.png
	assets/2886b8bb/eraser.png
	assets/2886b8bb/help.png
	assets/2886b8bb/manageAuth.png
	assets/2886b8bb/preview.png
	assets/2886b8bb/update.png
	assets/2886b8bb/users.png
	assets/2886b8bb/usersAssign.png
	assets/2886b8bb/wizard.png
	assets/332a0546/css/jquery.fileupload-ui.css
	assets/332a0546/js/jquery.iframe-transport.js
	assets/332a0546/js/locale.js
	assets/393aadbb/detailview/styles.css
	assets/393aadbb/gridview/bg.gif
	assets/393aadbb/gridview/delete.png
	assets/393aadbb/gridview/down.gif
	assets/393aadbb/gridview/jquery.yiigridview.js
	assets/393aadbb/gridview/loading.gif
	assets/393aadbb/gridview/styles.css
	assets/393aadbb/gridview/up.gif
	assets/393aadbb/gridview/update.png
	assets/393aadbb/gridview/view.png
	assets/393aadbb/listview/down.gif
	assets/393aadbb/listview/jquery.yiilistview.js
	assets/393aadbb/listview/loading.gif
	assets/393aadbb/listview/styles.css
	assets/393aadbb/listview/up.gif
	assets/3ae3951c/listview/jquery.yiilistview.js
	assets/3c577687/admin.png
	assets/3c577687/allow.png
	assets/3c577687/create.png
	assets/3c577687/delete.png
	assets/3c577687/eraser.png
	assets/3c577687/help.png
	assets/3c577687/manageAuth.png
	assets/3c577687/preview.png
	assets/3c577687/update.png
	assets/3c577687/users.png
	assets/3c577687/usersAssign.png
	assets/3c577687/wizard.png
	assets/43aa61e0/autocomplete/jquery.autocomplete.css
	assets/43aa61e0/jquery.autocomplete.js
	assets/43aa61e0/jquery.ba-bbq.js
	assets/43aa61e0/jquery.bgiframe.js
	assets/43aa61e0/jquery.cookie.js
	assets/43aa61e0/jquery.maskedinput.js
	assets/43aa61e0/jquery.maskedinput.min.js
	assets/43aa61e0/jquery.metadata.js
	assets/43aa61e0/jquery.treeview.edit.js
	assets/43aa61e0/jquery.treeview.js
	assets/43aa61e0/jquery.yii.js
	assets/43aa61e0/jquery.yiiactiveform.js
	assets/43aa61e0/yiitab/jquery.yiitab.css
	assets/4c01cb9a/pager.css
	assets/5fc37bbf/autocomplete/indicator.gif
	assets/5fc37bbf/autocomplete/jquery.autocomplete.css
	assets/5fc37bbf/jquery.ajaxqueue.js
	assets/5fc37bbf/jquery.autocomplete.js
	assets/5fc37bbf/jquery.ba-bbq.js
	assets/5fc37bbf/jquery.bgiframe.js
	assets/5fc37bbf/jquery.cookie.js
	assets/5fc37bbf/jquery.js
	assets/5fc37bbf/jquery.maskedinput.js
	assets/5fc37bbf/jquery.maskedinput.min.js
	assets/5fc37bbf/jquery.metadata.js
	assets/5fc37bbf/jquery.multifile.js
	assets/5fc37bbf/jquery.rating.js
	assets/5fc37bbf/jquery.treeview.async.js
	assets/5fc37bbf/jquery.treeview.edit.js
	assets/5fc37bbf/jquery.treeview.js
	assets/5fc37bbf/jquery.yii.js
	assets/5fc37bbf/jquery.yiiactiveform.js
	assets/5fc37bbf/jquery.yiitab.js
	assets/5fc37bbf/jui/MIT-LICENSE.txt
	assets/5fc37bbf/jui/css/base/images/ui-bg_flat_0_aaaaaa_40x100.png
	assets/5fc37bbf/jui/css/base/images/ui-bg_flat_75_ffffff_40x100.png
	assets/5fc37bbf/jui/css/base/images/ui-bg_glass_55_fbf9ee_1x400.png
	assets/5fc37bbf/jui/css/base/images/ui-bg_glass_65_ffffff_1x400.png
	assets/5fc37bbf/jui/css/base/images/ui-bg_glass_75_dadada_1x400.png
	assets/5fc37bbf/jui/css/base/images/ui-bg_glass_75_e6e6e6_1x400.png
	assets/5fc37bbf/jui/css/base/images/ui-bg_glass_95_fef1ec_1x400.png
	assets/5fc37bbf/jui/css/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	assets/5fc37bbf/jui/css/base/images/ui-icons_222222_256x240.png
	assets/5fc37bbf/jui/css/base/images/ui-icons_2e83ff_256x240.png
	assets/5fc37bbf/jui/css/base/images/ui-icons_454545_256x240.png
	assets/5fc37bbf/jui/css/base/images/ui-icons_888888_256x240.png
	assets/5fc37bbf/jui/css/base/images/ui-icons_cd0a0a_256x240.png
	assets/5fc37bbf/rating/delete.gif
	assets/5fc37bbf/rating/jquery.rating.css
	assets/5fc37bbf/rating/star.gif
	assets/5fc37bbf/treeview/images/ajax-loader.gif
	assets/5fc37bbf/treeview/images/file.gif
	assets/5fc37bbf/treeview/images/folder-closed.gif
	assets/5fc37bbf/treeview/images/folder.gif
	assets/5fc37bbf/treeview/images/minus.gif
	assets/5fc37bbf/treeview/images/plus.gif
	assets/5fc37bbf/treeview/images/treeview-black-line.gif
	assets/5fc37bbf/treeview/images/treeview-black.gif
	assets/5fc37bbf/treeview/images/treeview-default-line.gif
	assets/5fc37bbf/treeview/images/treeview-default.gif
	assets/5fc37bbf/treeview/images/treeview-famfamfam-line.gif
	assets/5fc37bbf/treeview/images/treeview-famfamfam.gif
	assets/5fc37bbf/treeview/images/treeview-gray-line.gif
	assets/5fc37bbf/treeview/images/treeview-gray.gif
	assets/5fc37bbf/treeview/images/treeview-red-line.gif
	assets/5fc37bbf/treeview/images/treeview-red.gif
	assets/5fc37bbf/treeview/jquery.treeview.css
	assets/5fc37bbf/yiitab/jquery.yiitab.css
	assets/847f1c7/admin.png
	assets/847f1c7/allow.png
	assets/847f1c7/create.png
	assets/847f1c7/delete.png
	assets/847f1c7/eraser.png
	assets/847f1c7/help.png
	assets/847f1c7/manageAuth.png
	assets/847f1c7/preview.png
	assets/847f1c7/update.png
	assets/847f1c7/users.png
	assets/847f1c7/usersAssign.png
	assets/847f1c7/wizard.png
	assets/88da4a31/css/bootstrap-responsive.min.css
	assets/88da4a31/css/bootstrap-yii.css
	assets/88da4a31/img/glyphicons-halflings-white.png
	assets/88da4a31/img/glyphicons-halflings.png
	assets/88da4a31/img/loading.gif
	assets/88da4a31/js/bootstrap.min.js
	assets/8a45cc6e/error.png
	assets/8a45cc6e/noError.png
	assets/8a45cc6e/process-working.gif
	assets/8a45cc6e/srbac.css
	assets/8f87c7ca/jquery.js
	assets/8f87c7ca/jquery.yiitab.js
	assets/8f87c7ca/jui/MIT-LICENSE.txt
	assets/a7d927e5/detailview/styles.css
	assets/a7d927e5/gridview/jquery.yiigridview.js
	assets/a7d927e5/listview/styles.css
	assets/b0270ea9/css/ie.css
	assets/b0270ea9/css/main.css
	assets/b0270ea9/css/print.css
	assets/b0270ea9/css/screen.css
	assets/b0270ea9/images/logo.png
	assets/b0270ea9/js/fancybox/blank.gif
	assets/b0270ea9/js/fancybox/fancy_close.png
	assets/b0270ea9/js/fancybox/fancy_loading.png
	assets/b0270ea9/js/fancybox/fancy_nav_left.png
	assets/b0270ea9/js/fancybox/fancy_nav_right.png
	assets/b0270ea9/js/fancybox/fancy_shadow_e.png
	assets/b0270ea9/js/fancybox/fancy_shadow_n.png
	assets/b0270ea9/js/fancybox/fancy_shadow_ne.png
	assets/b0270ea9/js/fancybox/fancy_shadow_nw.png
	assets/b0270ea9/js/fancybox/fancy_shadow_s.png
	assets/b0270ea9/js/fancybox/fancy_shadow_se.png
	assets/b0270ea9/js/fancybox/fancy_shadow_sw.png
	assets/b0270ea9/js/fancybox/fancy_shadow_w.png
	assets/b0270ea9/js/fancybox/fancy_title_left.png
	assets/b0270ea9/js/fancybox/fancy_title_main.png
	assets/b0270ea9/js/fancybox/fancy_title_over.png
	assets/b0270ea9/js/fancybox/fancy_title_right.png
	assets/b0270ea9/js/fancybox/fancybox-x.png
	assets/b0270ea9/js/fancybox/fancybox-y.png
	assets/b0270ea9/js/fancybox/fancybox.png
	assets/b0270ea9/js/fancybox/jquery.fancybox-1.3.1.css
	assets/b0270ea9/js/fancybox/jquery.fancybox-1.3.1.pack.js
	assets/b0270ea9/js/jquery.tooltip-1.2.6.min.js
	assets/b0270ea9/js/main.js
	assets/b191b502/autocomplete/indicator.gif
	assets/b191b502/autocomplete/jquery.autocomplete.css
	assets/b191b502/jquery.ajaxqueue.js
	assets/b191b502/jquery.autocomplete.js
	assets/b191b502/jquery.ba-bbq.js
	assets/b191b502/jquery.bgiframe.js
	assets/b191b502/jquery.cookie.js
	assets/b191b502/jquery.js
	assets/b191b502/jquery.maskedinput.js
	assets/b191b502/jquery.maskedinput.min.js
	assets/b191b502/jquery.metadata.js
	assets/b191b502/jquery.multifile.js
	assets/b191b502/jquery.rating.js
	assets/b191b502/jquery.treeview.async.js
	assets/b191b502/jquery.treeview.edit.js
	assets/b191b502/jquery.treeview.js
	assets/b191b502/jquery.yii.js
	assets/b191b502/jquery.yiiactiveform.js
	assets/b191b502/jquery.yiitab.js
	assets/b191b502/jui/MIT-LICENSE.txt
	assets/b191b502/jui/css/base/images/ui-bg_flat_0_aaaaaa_40x100.png
	assets/b191b502/jui/css/base/images/ui-bg_flat_75_ffffff_40x100.png
	assets/b191b502/jui/css/base/images/ui-bg_glass_55_fbf9ee_1x400.png
	assets/b191b502/jui/css/base/images/ui-bg_glass_65_ffffff_1x400.png
	assets/b191b502/jui/css/base/images/ui-bg_glass_75_dadada_1x400.png
	assets/b191b502/jui/css/base/images/ui-bg_glass_75_e6e6e6_1x400.png
	assets/b191b502/jui/css/base/images/ui-bg_glass_95_fef1ec_1x400.png
	assets/b191b502/jui/css/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	assets/b191b502/jui/css/base/images/ui-icons_222222_256x240.png
	assets/b191b502/jui/css/base/images/ui-icons_2e83ff_256x240.png
	assets/b191b502/jui/css/base/images/ui-icons_454545_256x240.png
	assets/b191b502/jui/css/base/images/ui-icons_888888_256x240.png
	assets/b191b502/jui/css/base/images/ui-icons_cd0a0a_256x240.png
	assets/b191b502/rating/delete.gif
	assets/b191b502/rating/jquery.rating.css
	assets/b191b502/rating/star.gif
	assets/b191b502/treeview/images/ajax-loader.gif
	assets/b191b502/treeview/images/file.gif
	assets/b191b502/treeview/images/folder-closed.gif
	assets/b191b502/treeview/images/folder.gif
	assets/b191b502/treeview/images/minus.gif
	assets/b191b502/treeview/images/plus.gif
	assets/b191b502/treeview/images/treeview-black-line.gif
	assets/b191b502/treeview/images/treeview-black.gif
	assets/b191b502/treeview/images/treeview-default-line.gif
	assets/b191b502/treeview/images/treeview-default.gif
	assets/b191b502/treeview/images/treeview-famfamfam-line.gif
	assets/b191b502/treeview/images/treeview-famfamfam.gif
	assets/b191b502/treeview/images/treeview-gray-line.gif
	assets/b191b502/treeview/images/treeview-gray.gif
	assets/b191b502/treeview/images/treeview-red-line.gif
	assets/b191b502/treeview/images/treeview-red.gif
	assets/b191b502/treeview/jquery.treeview.css
	assets/b191b502/yiitab/jquery.yiitab.css
	assets/be554b2e/error.png
	assets/be554b2e/noError.png
	assets/be554b2e/process-working.gif
	assets/be554b2e/srbac.css
	assets/cd838a7b/gridview/styles.css
	assets/d7686306/detailview/styles.css
	assets/d7686306/gridview/bg.gif
	assets/d7686306/gridview/delete.png
	assets/d7686306/gridview/down.gif
	assets/d7686306/gridview/jquery.yiigridview.js
	assets/d7686306/gridview/loading.gif
	assets/d7686306/gridview/styles.css
	assets/d7686306/gridview/up.gif
	assets/d7686306/gridview/update.png
	assets/d7686306/gridview/view.png
	assets/d7686306/listview/down.gif
	assets/d7686306/listview/jquery.yiilistview.js
	assets/d7686306/listview/loading.gif
	assets/d7686306/listview/styles.css
	assets/d7686306/listview/up.gif
	assets/eef2e2d6/css/bootstrap-responsive.min.css
	assets/eef2e2d6/css/bootstrap-yii.css
	assets/eef2e2d6/css/bootstrap.min.css
	assets/eef2e2d6/img/glyphicons-halflings-white.png
	assets/eef2e2d6/img/glyphicons-halflings.png
	assets/eef2e2d6/img/loading.gif
	assets/eef2e2d6/js/bootstrap.min.js
	protected/runtime/application.log