Merge branch 'deni-dev(pc)' into 'master'

dropdown parent

See merge request !211

src/container/MasterData/formReportItems/EditReportItems.js

@@ -161,7 +161,7 @@ export default class EditReportItems extends Component {
             "company_id": this.state.company == null ? this.state.tempData.company_id : this.state.company.company_id,
             "description": this.state.tempData.description,
             "orders": this.state.tempData.order,
-            "parent": this.state.parent == null ? this.state.tempData.parent : this.state.parent.item_report_id,
+            "parent": this.state.parent == null ? null : this.state.parent.item_report_id,
             "type_report_id": this.state.InputType == null ? this.state.tempData.type_item_report_id : this.state.InputType.type_item_report_id,
             "formula": this.state.tempData.formula,
             "uom": this.state.tempData.uom,