first commit
add oplata type
Add retype product code
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/Shop.iml
	.idea/frameworkRootSettings.xml
	.idea/misc.xml
	.idea/vcs.xml
	.idea/workspace.xml
	assets/1eea06f4/js/fancybox/jquery.fancybox-1.3.1.css
	assets/cdf94003/jquery.ajaxqueue.js
	assets/cdf94003/jquery.multifile.js
	assets/cdf94003/jquery.rating.js
	assets/cdf94003/jquery.treeview.async.js
	assets/cdf94003/rating/jquery.rating.css
	assets/cdf94003/treeview/jquery.treeview.css
	assets/d70022d7/jquery.ajaxqueue.js
	assets/d70022d7/jquery.multifile.js
	assets/d70022d7/jquery.rating.js
	assets/d70022d7/jquery.treeview.async.js
	assets/d70022d7/rating/jquery.rating.css
	assets/d70022d7/treeview/jquery.treeview.css
	assets/e3ecaab1/less/yii.less
	assets/eca9f7bc/js/fancybox/jquery.fancybox-1.3.1.css
	protected/.htaccess
	protected/components/Controller.php
	protected/components/Formatter.php
	protected/components/UserIdentity.php
	protected/controllers/AdminController.php
	protected/controllers/BuhgalterController.php
	protected/controllers/CategoryController.php
	protected/controllers/ColourController.php
	protected/controllers/CompanyController.php
	protected/controllers/ContragentController.php
	protected/controllers/InventarController.php
	protected/controllers/InventarLotController.php
	protected/controllers/MovingController.php
	protected/controllers/MovingLotController.php
	protected/controllers/PreorderController.php
	protected/controllers/PrihodLotController.php
	protected/controllers/PrihodnayaController.php
	protected/controllers/ProductController.php
	protected/controllers/RashodLotController.php
	protected/controllers/RashodnayaController.php
	protected/controllers/ReportController.php
	protected/controllers/RetailerController.php
	protected/controllers/SellerController.php
	protected/controllers/SiteController.php
	protected/controllers/SizeController.php
	protected/controllers/UserController.php
	protected/controllers/WarehouseController.php
	protected/controllers/report/ProductBalanceAction.php
	protected/controllers/report/ProductSellAction.php
	protected/extensions/bootstrap/LICENSE.txt
	protected/extensions/bootstrap/assets/css/bootstrap-responsive.css
	protected/extensions/bootstrap/assets/css/bootstrap-responsive.min.css
	protected/extensions/bootstrap/assets/css/bootstrap.css
	protected/extensions/bootstrap/assets/css/bootstrap.min.css
	protected/extensions/bootstrap/assets/css/yii.css
	protected/extensions/bootstrap/assets/img/glyphicons-halflings-white.png
	protected/extensions/bootstrap/assets/img/glyphicons-halflings.png
	protected/extensions/bootstrap/assets/img/loading.gif
	protected/extensions/bootstrap/assets/js/bootstrap-affix.js
	protected/extensions/bootstrap/assets/js/bootstrap-alert.js
	protected/extensions/bootstrap/assets/js/bootstrap-button.js
	protected/extensions/bootstrap/assets/js/bootstrap-carousel.js
	protected/extensions/bootstrap/assets/js/bootstrap-collapse.js
	protected/extensions/bootstrap/assets/js/bootstrap-dropdown.js
	protected/extensions/bootstrap/assets/js/bootstrap-modal.js
	protected/extensions/bootstrap/assets/js/bootstrap-popover.js
	protected/extensions/bootstrap/assets/js/bootstrap-scrollspy.js
	protected/extensions/bootstrap/assets/js/bootstrap-tab.js
	protected/extensions/bootstrap/assets/js/bootstrap-tooltip.js
	protected/extensions/bootstrap/assets/js/bootstrap-transition.js
	protected/extensions/bootstrap/assets/js/bootstrap-typeahead.js
	protected/extensions/bootstrap/assets/js/bootstrap.js
	protected/extensions/bootstrap/assets/js/bootstrap.min.js
	protected/extensions/bootstrap/assets/less/accordion.less
	protected/extensions/bootstrap/assets/less/alerts.less
	protected/extensions/bootstrap/assets/less/bootstrap.less
	protected/extensions/bootstrap/assets/less/breadcrumbs.less
	protected/extensions/bootstrap/assets/less/button-groups.less
	protected/extensions/bootstrap/assets/less/buttons.less
	protected/extensions/bootstrap/assets/less/carousel.less
	protected/extensions/bootstrap/assets/less/close.less
	protected/extensions/bootstrap/assets/less/code.less
	protected/extensions/bootstrap/assets/less/component-animations.less
	protected/extensions/bootstrap/assets/less/dropdowns.less
	protected/extensions/bootstrap/assets/less/forms.less
	protected/extensions/bootstrap/assets/less/grid.less
	protected/extensions/bootstrap/assets/less/hero-unit.less
	protected/extensions/bootstrap/assets/less/labels-badges.less
	protected/extensions/bootstrap/assets/less/layouts.less
	protected/extensions/bootstrap/assets/less/media.less
	protected/extensions/bootstrap/assets/less/mixins.less
	protected/extensions/bootstrap/assets/less/modals.less
	protected/extensions/bootstrap/assets/less/navbar.less
	protected/extensions/bootstrap/assets/less/navs.less
	protected/extensions/bootstrap/assets/less/pager.less
	protected/extensions/bootstrap/assets/less/pagination.less
	protected/extensions/bootstrap/assets/less/popovers.less
	protected/extensions/bootstrap/assets/less/progress-bars.less
	protected/extensions/bootstrap/assets/less/reset.less
	protected/extensions/bootstrap/assets/less/responsive-1200px-min.less
	protected/extensions/bootstrap/assets/less/responsive-767px-max.less
	protected/extensions/bootstrap/assets/less/responsive-768px-979px.less
	protected/extensions/bootstrap/assets/less/responsive-navbar.less
	protected/extensions/bootstrap/assets/less/responsive-utilities.less
	protected/extensions/bootstrap/assets/less/responsive.less
	protected/extensions/bootstrap/assets/less/scaffolding.less
	protected/extensions/bootstrap/assets/less/sprites.less
	protected/extensions/bootstrap/assets/less/tables.less
	protected/extensions/bootstrap/assets/less/thumbnails.less
	protected/extensions/bootstrap/assets/less/tooltip.less
	protected/extensions/bootstrap/assets/less/type.less
	protected/extensions/bootstrap/assets/less/utilities.less
	protected/extensions/bootstrap/assets/less/variables.less
	protected/extensions/bootstrap/assets/less/wells.less
	protected/extensions/bootstrap/assets/less/yii.less
	protected/extensions/bootstrap/components/Bootstrap.php
	protected/extensions/bootstrap/form/TbForm.php
	protected/extensions/bootstrap/form/TbFormButtonElement.php
	protected/extensions/bootstrap/form/TbFormInputElement.php
	protected/extensions/bootstrap/gii/bootstrap/BootstrapCode.php
	protected/extensions/bootstrap/gii/bootstrap/BootstrapGenerator.php
	protected/extensions/bootstrap/gii/bootstrap/templates/default/_form.php
	protected/extensions/bootstrap/gii/bootstrap/templates/default/_search.php
	protected/extensions/bootstrap/gii/bootstrap/templates/default/_view.php
	protected/extensions/bootstrap/gii/bootstrap/templates/default/admin.php
	protected/extensions/bootstrap/gii/bootstrap/templates/default/controller.php
	protected/extensions/bootstrap/gii/bootstrap/templates/default/create.php
	protected/extensions/bootstrap/gii/bootstrap/templates/default/index.php
	protected/extensions/bootstrap/gii/bootstrap/templates/default/update.php
	protected/extensions/bootstrap/gii/bootstrap/templates/default/view.php
	protected/extensions/bootstrap/gii/bootstrap/views/index.php
	protected/extensions/bootstrap/theme/css/styles.css
	protected/extensions/bootstrap/theme/views/.htaccess
	protected/extensions/bootstrap/theme/views/layouts/column2.php
	protected/extensions/bootstrap/theme/views/layouts/main.php
	protected/extensions/bootstrap/theme/views/site/contact.php
	protected/extensions/bootstrap/theme/views/site/index.php
	protected/extensions/bootstrap/theme/views/site/login.php
	protected/extensions/bootstrap/widgets/TbActiveForm.php
	protected/extensions/bootstrap/widgets/TbAffix.php
	protected/extensions/bootstrap/widgets/TbAlert.php
	protected/extensions/bootstrap/widgets/TbBadge.php
	protected/extensions/bootstrap/widgets/TbBaseMenu.php
	protected/extensions/bootstrap/widgets/TbBreadcrumbs.php
	protected/extensions/bootstrap/widgets/TbButton.php
	protected/extensions/bootstrap/widgets/TbButtonColumn.php
	protected/extensions/bootstrap/widgets/TbButtonGroup.php
	protected/extensions/bootstrap/widgets/TbCarousel.php
	protected/extensions/bootstrap/widgets/TbCollapse.php
	protected/extensions/bootstrap/widgets/TbDataColumn.php
	protected/extensions/bootstrap/widgets/TbDetailView.php
	protected/extensions/bootstrap/widgets/TbDropdown.php
	protected/extensions/bootstrap/widgets/TbGridView.php
	protected/extensions/bootstrap/widgets/TbHeroUnit.php
	protected/extensions/bootstrap/widgets/TbLabel.php
	protected/extensions/bootstrap/widgets/TbListView.php
	protected/extensions/bootstrap/widgets/TbMenu.php
	protected/extensions/bootstrap/widgets/TbModal.php
	protected/extensions/bootstrap/widgets/TbNavbar.php
	protected/extensions/bootstrap/widgets/TbPager.php
	protected/extensions/bootstrap/widgets/TbProgress.php
	protected/extensions/bootstrap/widgets/TbScrollSpy.php
	protected/extensions/bootstrap/widgets/TbTabs.php
	protected/extensions/bootstrap/widgets/TbThumbnails.php
	protected/extensions/bootstrap/widgets/TbTypeahead.php
	protected/extensions/bootstrap/widgets/input/TbInput.php
	protected/extensions/bootstrap/widgets/input/TbInputHorizontal.php
	protected/extensions/bootstrap/widgets/input/TbInputInline.php
	protected/extensions/bootstrap/widgets/input/TbInputSearch.php
	protected/extensions/bootstrap/widgets/input/TbInputVertical.php
	protected/extensions/print/media/print.css
	protected/extensions/print/media/print.gif
	protected/extensions/print/printWidget.php
	protected/extensions/print/readme.txt
	protected/filters/AdminAccessFilter.php
	protected/filters/AuthFilter.php
	protected/filters/BuhgalterAccessFilter.php
	protected/models/Busket.php
	protected/models/BuyForm.php
	protected/models/Category.php
	protected/models/Colour.php
	protected/models/Company.php
	protected/models/ContactForm.php
	protected/models/Contragent.php
	protected/models/DiscountForm.php
	protected/models/Inventar.php
	protected/models/InventarLot.php
	protected/models/InventarTransaction.php
	protected/models/LoginForm.php
	protected/models/MessageType.php
	protected/models/Messages.php
	protected/models/Moving.php
	protected/models/MovingLot.php
	protected/models/MovingTransaction.php
	protected/models/PayCheck.php
	protected/models/Preorder.php
	protected/models/PrihodLot.php
	protected/models/Prihodnaya.php
	protected/models/Product.php
	protected/models/ProductBalanceForm.php
	protected/models/ProductBalanceMoney.php
	protected/models/ProductSellForm.php
	protected/models/RashodLot.php
	protected/models/RashodTransaction.php
	protected/models/Rashodnaya.php
	protected/models/Retailer.php
	protected/models/Session.php
	protected/models/Size.php
	protected/models/User.php
	protected/models/UserRole.php
	protected/models/Warehouse.php
	protected/runtime/application (Конфликтующая копия с компьютера iMac-Home 2013-06-19).log
	protected/runtime/application.log
	protected/runtime/application.log.1
	protected/runtime/application.log.2
	protected/runtime/application.log.3
	protected/runtime/application.log.4
	protected/runtime/application.log.5
	protected/runtime/gii-1.1.13/BootstrapCode.php
	protected/runtime/gii-1.1.13/ControllerCode.php
	protected/runtime/gii-1.1.13/ModelCode.php
	protected/runtime/state.bin
	protected/tests/WebTestCase.php
	protected/tests/bootstrap.php
	protected/tests/functional/SiteTest.php
	protected/tests/phpunit.xml
	protected/views.zip
	protected/views/admin/_form.php
	protected/views/admin/_search.php
	protected/views/admin/_view.php
	protected/views/admin/admin.php
	protected/views/admin/create.php
	protected/views/admin/index.php
	protected/views/admin/update.php
	protected/views/admin/view.php
	protected/views/buhgalter/index.php
	protected/views/category/_form.php
	protected/views/category/_search.php
	protected/views/category/_view.php
	protected/views/category/admin.php
	protected/views/category/create.php
	protected/views/category/index.php
	protected/views/category/update.php
	protected/views/category/view.php
	protected/views/colour/_form.php
	protected/views/colour/_search.php
	protected/views/colour/_view.php
	protected/views/colour/admin.php
	protected/views/colour/create.php
	protected/views/colour/index.php
	protected/views/colour/update.php
	protected/views/colour/view.php
	protected/views/company/_form.php
	protected/views/company/_search.php
	protected/views/company/_view.php
	protected/views/company/admin.php
	protected/views/company/create.php
	protected/views/company/index.php
	protected/views/company/update.php
	protected/views/company/view.php
	protected/views/contragent/_form.php
	protected/views/contragent/_search.php
	protected/views/contragent/_view.php
	protected/views/contragent/admin.php
	protected/views/contragent/create.php
	protected/views/contragent/index.php
	protected/views/contragent/update.php
	protected/views/contragent/view.php
	protected/views/inventar/_form.php
	protected/views/inventar/_search.php
	protected/views/inventar/_view.php
	protected/views/inventar/admin.php
	protected/views/inventar/create.php
	protected/views/inventar/index.php
	protected/views/inventar/printForm.php
	protected/views/inventar/update.php
	protected/views/inventar/view.php
	protected/views/inventarLot/_form.php
	protected/views/inventarLot/_search.php
	protected/views/inventarLot/_view.php
	protected/views/inventarLot/admin.php
	protected/views/inventarLot/create.php
	protected/views/inventarLot/index.php
	protected/views/inventarLot/update.php
	protected/views/inventarLot/view.php
	protected/views/layouts/column1.php
	protected/views/layouts/column2.php
	protected/views/layouts/main.php
	protected/views/moving/_form.php
	protected/views/moving/_search.php
	protected/views/moving/_view.php
	protected/views/moving/admin.php
	protected/views/moving/create.php
	protected/views/moving/index.php
	protected/views/moving/printForm.php
	protected/views/moving/update.php
	protected/views/moving/view.php
	protected/views/movingLot/_form.php
	protected/views/movingLot/_search.php
	protected/views/movingLot/_view.php
	protected/views/movingLot/admin.php
	protected/views/movingLot/create.php
	protected/views/movingLot/index.php
	protected/views/movingLot/update.php
	protected/views/movingLot/view.php
	protected/views/preorder/_search.php
	protected/views/preorder/admin.php
	protected/views/prihodLot/_form.php
	protected/views/prihodLot/_search.php
	protected/views/prihodLot/_view.php
	protected/views/prihodLot/admin.php
	protected/views/prihodLot/create.php
	protected/views/prihodLot/index.php
	protected/views/prihodLot/update.php
	protected/views/prihodLot/view.php
	protected/views/prihodnaya/_form.php
	protected/views/prihodnaya/_search.php
	protected/views/prihodnaya/_view.php
	protected/views/prihodnaya/admin.php
	protected/views/prihodnaya/create.php
	protected/views/prihodnaya/index.php
	protected/views/prihodnaya/printForm.php
	protected/views/prihodnaya/update.php
	protected/views/prihodnaya/view.php
	protected/views/product/_form.php
	protected/views/product/_search.php
	protected/views/product/_view.php
	protected/views/product/admin.php
	protected/views/product/create.php
	protected/views/product/index.php
	protected/views/product/update.php
	protected/views/product/view.php
	protected/views/rashodLot/_form.php
	protected/views/rashodLot/_search.php
	protected/views/rashodLot/_view.php
	protected/views/rashodLot/admin.php
	protected/views/rashodLot/create.php
	protected/views/rashodLot/index.php
	protected/views/rashodLot/update.php
	protected/views/rashodLot/view.php
	protected/views/rashodnaya/_form.php
	protected/views/rashodnaya/_search.php
	protected/views/rashodnaya/_view.php
	protected/views/rashodnaya/admin.php
	protected/views/rashodnaya/create.php
	protected/views/rashodnaya/index.php
	protected/views/rashodnaya/printForm.php
	protected/views/rashodnaya/update.php
	protected/views/rashodnaya/view.php
	protected/views/report/_search.php
	protected/views/report/balancePrintForm.php
	protected/views/report/index.php
	protected/views/report/productBalance.php
	protected/views/report/productBalanceMoney.php
	protected/views/report/productSell.php
	protected/views/report/sellPrintForm.php
	protected/views/retailer/_form.php
	protected/views/retailer/_search.php
	protected/views/retailer/_view.php
	protected/views/retailer/admin.php
	protected/views/retailer/create.php
	protected/views/retailer/index.php
	protected/views/retailer/update.php
	protected/views/retailer/view.php
	protected/views/seller/busket/admin.php
	protected/views/seller/busket/discount.php
	protected/views/seller/busket/index.php
	protected/views/seller/busket/pay_check.php
	protected/views/seller/busket/update.php
	protected/views/seller/buy_form.php
	protected/views/seller/index.php
	protected/views/seller/message/messages.php
	protected/views/seller/prihod/admin.php
	protected/views/seller/prihod/view.php
	protected/views/seller/report/printForm.php
	protected/views/seller/viewItem.php
	protected/views/site/contact.php
	protected/views/site/error.php
	protected/views/site/index.php
	protected/views/site/login.php
	protected/views/site/pages/about.php
	protected/views/size/_form.php
	protected/views/size/_search.php
	protected/views/size/_view.php
	protected/views/size/admin.php
	protected/views/size/create.php
	protected/views/size/index.php
	protected/views/size/update.php
	protected/views/size/view.php
	protected/views/user/_form.php
	protected/views/user/_search.php
	protected/views/user/_view.php
	protected/views/user/admin.php
	protected/views/user/create.php
	protected/views/user/index.php
	protected/views/user/update.php
	protected/views/user/view.php
	protected/views/warehouse/_form.php
	protected/views/warehouse/_search.php
	protected/views/warehouse/_view.php
	protected/views/warehouse/admin.php
	protected/views/warehouse/create.php
	protected/views/warehouse/index.php
	protected/views/warehouse/update.php
	protected/views/warehouse/view.php
	protected/yiic
	protected/yiic.bat
	protected/yiic.php
	themes/bootstrap/css/styles.css
	themes/bootstrap/views/.htaccess
	themes/bootstrap/views/layouts/column2.php
	themes/bootstrap/views/layouts/column2_report.php
	themes/bootstrap/views/layouts/main.php
	themes/bootstrap/views/layouts/main_admin.php
	themes/bootstrap/views/layouts/main_buh.php
	themes/bootstrap/views/layouts/main_report.php
	themes/bootstrap/views/site/contact.php
	themes/bootstrap/views/site/index.php
	themes/bootstrap/views/site/login.php
	themes/classic/views/.htaccess