diff --git a/odex25_sales/dev_membership/__manifest__.py b/odex25_sales/dev_membership/__manifest__.py index b1970aae1..be10859ae 100644 --- a/odex25_sales/dev_membership/__manifest__.py +++ b/odex25_sales/dev_membership/__manifest__.py @@ -80,6 +80,8 @@ odoo app manage Membership subscription plans, odoo membership memeber, odoo mem 'views/board_membership_nomination.xml', 'report/print_membership_template.xml', 'report/print_membership_menu.xml', + 'report/membership_nomaination_header_footer.xml', + 'report/membership_nomaination_template.xml', 'data/mail_template.xml', # ], diff --git a/odex25_sales/dev_membership/models/board_membership_nomination.py b/odex25_sales/dev_membership/models/board_membership_nomination.py index eb1ae11bd..e97f5eac6 100644 --- a/odex25_sales/dev_membership/models/board_membership_nomination.py +++ b/odex25_sales/dev_membership/models/board_membership_nomination.py @@ -50,6 +50,7 @@ class BoardMembershipNomination(models.Model): 'subscription_years': total_duration, 'status': 'nominated', 'nomination_id': record.id, + 'membership_number': memberships[0].name, }) # for m in memberships: # @@ -119,6 +120,7 @@ class BoardNominee(models.Model): vote_count = fields.Integer('Votes') notes = fields.Text('Notes') nomination_id = fields.Many2one('board.membership.nomination', string="Nomination") + membership_number = fields.Char('Membership Number', readonly=True) def action_accept(self): for line in self: diff --git a/odex25_sales/dev_membership/report/membership_nomaination_header_footer.xml b/odex25_sales/dev_membership/report/membership_nomaination_header_footer.xml new file mode 100644 index 000000000..2004fd7bd --- /dev/null +++ b/odex25_sales/dev_membership/report/membership_nomaination_header_footer.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + diff --git a/odex25_sales/dev_membership/report/membership_nomaination_template.xml b/odex25_sales/dev_membership/report/membership_nomaination_template.xml new file mode 100644 index 000000000..de649018f --- /dev/null +++ b/odex25_sales/dev_membership/report/membership_nomaination_template.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + diff --git a/odex25_sales/dev_membership/report/print_membership_menu.xml b/odex25_sales/dev_membership/report/print_membership_menu.xml index 5e572cc40..c48290a08 100644 --- a/odex25_sales/dev_membership/report/print_membership_menu.xml +++ b/odex25_sales/dev_membership/report/print_membership_menu.xml @@ -34,4 +34,16 @@ For Module Support : devintelle@gmail.com or Skype : devintelle report + + + + Print Membership Nomination + board.membership.nomination + qweb-pdf + dev_membership.membership_nomination_template + dev_membership.membership_nomination_template + + report + + \ No newline at end of file diff --git a/odex25_sales/dev_membership/static/description/company-logo.png b/odex25_sales/dev_membership/static/description/company-logo.png new file mode 100644 index 000000000..642d78b46 Binary files /dev/null and b/odex25_sales/dev_membership/static/description/company-logo.png differ diff --git a/odex25_sales/dev_membership/views/board_membership_nomination.xml b/odex25_sales/dev_membership/views/board_membership_nomination.xml index af5dfb61f..f2f7f17bc 100644 --- a/odex25_sales/dev_membership/views/board_membership_nomination.xml +++ b/odex25_sales/dev_membership/views/board_membership_nomination.xml @@ -54,6 +54,7 @@ +