Optimization of the "header" (arrangement of parameters) in the form of creating a report document?

Question

User interface

Hello.
A form has been developed for creating a document-report on the number of agricultural machinery in a certain period of time in his organization. The user must indicate the organization for which he prepares the report, as well as the period for which he generates the report.
Button assignment description:

1. "Save and close" button - after pressing the system writes the document and closes the document creation form
   
2. "Record" button - after pressing the system writes the document
   

1. Number - the serial number of the document is automatically entered by the system after recording. The user can manually select a different date.
   
2. from - the current date of creation by the system after recording is automatically entered. The user can manually select a different date.
   

1. Document period - manually the user selects the period for which the report document is generated. By default, the current year is displayed. Obligatory field.
   

1. Company - the user selects from the drop-down list the organization for which the document-report is being prepared. By default - the organization of the user under whose login is logged in is displayed. Obligatory field.
   

1. Department - the user selects from the drop-down list the department of the institution for which the document-report is being prepared. By default - the department of the user under whose login is logged in is displayed
   
2. Recipient - the user selects the parent organization from the drop-down list, where the created report document is sent. Not required to fill out.
   
3. To - text field. The user can type the name of the recipient
   
4. Status - the user selects the readiness/consideration status (draft, pending, signed) of the report document from the drop-down list. The default is project.
   
5. "Fill" button - after clicking, the table automatically displays the data received from the database.
   
6. "Add" button - after clicking, a row is automatically added to the table, which the user can manually fill in
   

If you press the "TAB" button, the system will highlight the fields in the following order:
№->from->Document period->Status->Company->Recipient->Department->To whom I am attaching a screenshot
of how it is done now "1.How Now" and "Screen form as in my opinion"
In the form "As now" on the one hand, it seems to look good, the logic is clear, that to whom and from whom the fields are similar in idea, so they were combined side by side. And everything else is at the top
. I see the following:
A) The user needs to generate data for his institution and for the current year. So he will not touch the "reporting period" and "institution", "service", will leave the values ​​\u200b\u200bspecified by default by the system. A will indicate the "Recipient" and "To" and click the "Fill" button. The report is ready.I cannot say how often the document will be processed according to this scenario.

B) The user needs to generate data for a branch (another institution) and for another year. So he will change the "period" and "institution", will choose other values. And then only indicate the Recipient and To whom and press the "Fill" button. The report is ready. I cannot say how often the document will be processed according to this scenario.

Please tell me, based on the above, which version of the screenshots is better? What can be done better in terms of the interface?
1. "1. As it is now"
or
2. Screen form as I think - I can't figure out yet how to group fields...

Answer 1

despoth , xmoonlight , @Pavel Designer, Huge request to see my question.