Yaltik
/
golem
1
0
Fork 2
Code Issues Pull Requests 4 Releases Activity

[IMP]GOLEM Resource Accont : add invoicing information on form, add search options

This commit is contained in:
Fabien BOURGEOIS 2018-03-26 12:02:41 +02:00
parent 942975e187
commit 4fc04548a6
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
golem_resource_account/models/golem_resource_reservation.py
View File

@ -28,10 +28,12 @@ class GolemResourceReservation(models.Model):
_inherit = 'golem.resource.reservation' _inherit = 'golem.resource.reservation'
resource_product_id = fields.Many2one(related='resource_id.product_tmpl_id') resource_product_id = fields.Many2one(related='resource_id.product_tmpl_id')
invoice_id = fields.Many2one('account.invoice') invoice_id = fields.Many2one('account.invoice', 'Invoice', index=True)
invoicing_state = fields.Selection(related="invoice_id.state", invoice_state = fields.Selection(related='invoice_id.state', store=True)
string="Invoicing Status", default="None") invoice_amount_total = fields.Monetary(related='invoice_id.amount_total')
invoice_line_id = fields.Many2one('account.invoice.line')
invoice_line_price_subtotal = fields.Monetary(related='invoice_line_id.price_subtotal')
currency_id = fields.Many2one(related='invoice_id.currency_id')
@api.multi @api.multi
def create_invoice(self): def create_invoice(self):

54
golem_resource_account/views/golem_resource_reservation_views.xml
View File

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name='inherit_id' ref="golem_resource.golem_resource_reservation_view_tree"/> <field name='inherit_id' ref="golem_resource.golem_resource_reservation_view_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="state" position="after"> <field name="state" position="after">
<field name="invoicing_state"/> <field name="invoice_state" string="Invoice status" />
</field> </field>
</field> </field>
</record> </record>
@ -41,44 +41,40 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name='inherit_id' ref="golem_resource.golem_resource_reservation_view_form"/> <field name='inherit_id' ref="golem_resource.golem_resource_reservation_view_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<button name="state_rejected" position="after"> <button name="state_rejected" position="after">
<field name="resource_product_id" invisible="1" />
<button name="create_invoice" type="object" string="Create Invoice" class="oe_highlight" <button name="create_invoice" type="object" string="Create Invoice" class="oe_highlight"
attrs="{'invisible': ['|', ('state', '!=', 'validated'), ('resource_product_id', '=', False)]}" /> attrs="{'invisible': ['|', ('state', '!=', 'validated'), ('resource_product_id', '=', False)]}" />
</button> </button>
<group name="reservation" position="after">
<group name="invoicing" string="Invoicing"
attrs="{'invisible': ['|', ('state', '!=', 'validated'), ('resource_product_id', '=', False)]}">
<field name="resource_product_id" />
<field name="invoice_id" />
<field name="invoice_amount_total" />
<field name="invoice_line_id" />
<field name="invoice_line_price_subtotal" />
</group>
</group>
</field> </field>
</record> </record>
<!-- Searches --> <!-- Searches -->
<!--<record model="ir.ui.view" id="golem_resource_reservation_view_search"> <record model="ir.ui.view"
<field name="name">GOLEM Resource Reservation Search</field> id="golem_resource_reservation_search_inherit_golem_resource_account">
<field name="name"> GOLEM Resource Reservation Search Adaptations</field>
<field name="model">golem.resource.reservation</field> <field name="model">golem.resource.reservation</field>
<field name='inherit_id'
ref="golem_resource.golem_resource_reservation_view_search"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search> <field name="state" position="after">
<field name="date_start" /> <field name="invoice_id" />
<field name="date_stop" /> </field>
<field name="resource_id" /> <filter name="group_state" position="after">
<field name="user_id" /> <filter name="group_invoice_state" string="Invoice state"
<field name="partner_id" /> context="{'group_by': 'invoice_state'}" />
<field name="state" /> </filter>
<filter name="to_validate" string="Reservation to Validate"
domain="[('state', '=', 'confirmed')]" />
<filter name="group_state" string="State"
context="{'group_by': 'state'}" />
<filter name="group_resource" string="Resource"
context="{'group_by': 'resource_id'}" />
<filter name="group_partner_id" string="Partner"
context="{'group_by': 'partner_id'}" />
<filter name="group_user" string="User"
context="{'group_by': 'user_id'}" />
<filter name="group_date_month" string="Month"
context="{'group_by': 'date:month'}" />
<filter name="group_date_week" string="Week"
context="{'group_by': 'date:week'}" />
<filter name="group_date_day" string="Day"
context="{'group_by': 'date:day'}" />
</search>
</field> </field>
</record>--> </record>
<!-- Add option to the "More" button --> <!-- Add option to the "More" button -->
<act_window id="action_golem_reservation_invoice_wizard" <act_window id="action_golem_reservation_invoice_wizard"
name="Reservations to invoice" name="Reservations to invoice"