]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'refs/heads/feature_fomichev_erp-419_calculate_cleared_species_month_goa...
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 30 May 2025 12:50:31 +0000 (15:50 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 30 May 2025 12:50:31 +0000 (15:50 +0300)
commit0cc92a895d9241f9135c814d125601bfcbf085ea
treebeaae107867632f5e16950ef42edc66ea714f496
parent5f54e4dc22f40a0a07714b6bdfde25ab25f7e12b
parent57d815c3032c6d105417ac7c3095a657b09f9939
Merge branch 'refs/heads/feature_fomichev_erp-419_calculate_cleared_species_month_goal' into feature_fomichev_erp-363_count_offline_week_sales_forecast

# Conflicts:
# erp24/controllers/CategoryPlanController.php
# erp24/services/AutoPlannogrammaService.php
# erp24/services/StorePlanService.php
erp24/controllers/AutoPlannogrammaController.php
erp24/controllers/CategoryPlanController.php
erp24/services/AutoPlannogrammaService.php
erp24/services/StorePlanService.php