]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
projects / erp24_rep / yii-erp24 / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7268453 6a3a767)
Merge branch 'feature_smirnov_erp-381_edit_price_and_show_nacenka' into 'develop'
authorAleksey Filippov <aleksey.filippov@erp-flowers.ru>
Mon, 31 Mar 2025 06:54:26 +0000 (06:54 +0000)
committerAleksey Filippov <aleksey.filippov@erp-flowers.ru>
Mon, 31 Mar 2025 06:54:26 +0000 (06:54 +0000)
[ERP-381] inputed cost

See merge request gitlab-instance/yii-erp24!748

1  2 
erp24/views/bouquet/index.php patch | diff1 | diff2 | blob | history
erp24/web/js/bouquet/bouquet.js patch | diff1 | diff2 | blob | history

diff --cc erp24/views/bouquet/index.php
Simple merge
diff --cc erp24/web/js/bouquet/bouquet.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.