Merge branch 'php/plugins' of https://github.com/JetAlone/ERP into php/application
Error iss
Merge branch 'master' into php/application
Format, comments
asdasd
koniec testu
Joining modules 

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
@TODO - qm/edit
Delete module empty files

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Update prod edit

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Merge pull request #143 from JetAlone/php/application

Php/application
przedudowa tabeli w product/view (skończę, tylko pullnę kontrolery)
Update error

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Merge branch 'php/application'
Merge branch 'master' of https://github.com/jetalone/ERP into Quality-management

Conflicts:
	php/application/view/home/index.tpl
asd
Merge branch 'master' of https://github.com/jetalone/ERP into Quality-management