diff --git a/modules/company/letter.fodt b/modules/company/letter.fodt index 96d629fe11a710b395d9981881c5dfda1674becf_bW9kdWxlcy9jb21wYW55L2xldHRlci5mb2R0..532ac5ce0458557de16512c2751c2e394924e7e1_bW9kdWxlcy9jb21wYW55L2xldHRlci5mb2R0 100644 --- a/modules/company/letter.fodt +++ b/modules/company/letter.fodt @@ -349,8 +349,8 @@ <office:master-styles> <style:master-page style:name="Standard" style:page-layout-name="pm1"> <style:header> - <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><if test="user.company.header"></text:placeholder></text:p> + <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><if test="user.company and user.company.header"></text:placeholder></text:p> <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><for each="line in user.company.header_used.split('\n')"></text:placeholder></text:p> <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p> <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p> <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p> @@ -353,7 +353,7 @@ <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><for each="line in user.company.header_used.split('\n')"></text:placeholder></text:p> <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p> <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p> <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p> - <text:p text:style-name="P3"><text:placeholder text:placeholder-type="text"><user.company.rec_name></text:placeholder></text:p> + <text:p text:style-name="P3"><text:placeholder text:placeholder-type="text"><user.company.rec_name if user.company else ''></text:placeholder></text:p> </style:header> <style:footer> @@ -358,6 +358,6 @@ </style:header> <style:footer> - <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><if test="user.company.footer"></text:placeholder></text:p> + <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><if test="user.company and user.company.footer"></text:placeholder></text:p> <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><for each="line in user.company.footer_used.split('\n')"></text:placeholder></text:p> <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p> <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>