I log it in on one line. On the disposition line I write "see Page x, Line y"...

On that referenced line I enter the weapon as it's new NFA status and reference the assigned ATF control number from the Form 2. I log it out on that line when the item is sold and transferred.