audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[11.0][IMP] contract: Improve partner contract smartbutton

Browse Source
This commit is contained in:
Carlos Dauden
2017-12-15 11:00:02 +01:00
parent 3dd167190d
commit b56be42e2d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contract/models/account_analytic_account.py
View File

@@ -240,7 +240,8 @@ class AccountAnalyticAccount(models.Model):
invoice = self.env['account.invoice'].create(invoice_vals) invoice = self.env['account.invoice'].create(invoice_vals)
for line in self.recurring_invoice_line_ids: for line in self.recurring_invoice_line_ids:
invoice_line_vals = self._prepare_invoice_line(line, invoice.id) invoice_line_vals = self._prepare_invoice_line(line, invoice.id)
self.env['account.invoice.line'].create(invoice_line_vals) if invoice_line_vals:
self.env['account.invoice.line'].create(invoice_line_vals)
invoice.compute_taxes() invoice.compute_taxes()
return invoice return invoice

6
contract/models/res_partner.py
View File

@@ -18,8 +18,7 @@ class ResPartner(models.Model):
for partner in self: for partner in self:
partner.contract_count = Contract.search_count([ partner.contract_count = Contract.search_count([
('recurring_invoices', '=', True), ('recurring_invoices', '=', True),
('partner_id', '=', partner.id), ('partner_id', 'child_of', partner.ids),
('date_start', '<=', today),
'|', '|',
('date_end', '=', False), ('date_end', '=', False),
('date_end', '>=', today), ('date_end', '>=', today),
@@ -37,9 +36,10 @@ class ResPartner(models.Model):
self.env.context, self.env.context,
search_default_recurring_invoices=True, search_default_recurring_invoices=True,
search_default_not_finished=True, search_default_not_finished=True,
search_default_partner_id=self.id,
default_partner_id=self.id, default_partner_id=self.id,
default_recurring_invoices=True, default_recurring_invoices=True,
default_pricelist_id=self.pricelist_id.id,
), ),
domain=[('partner_id', '=', self.id)],
) )
return res return res

9
contract/views/account_analytic_account_view.xml
View File

@@ -116,12 +116,11 @@
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>
<field name="inherit_id" ref="analytic.view_account_analytic_account_search"/> <field name="inherit_id" ref="analytic.view_account_analytic_account_search"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="partner_id" position="after">
<field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"
string="Partner and dependents"/>
</field>
<field name="name" position="after"> <field name="name" position="after">
<field name="partner_id" position="after">
<!-- Use other field because partner_id already used -->
<field name="company_id" filter_domain="[('partner_id', 'child_of', self)]"
string="Partner and dependents"/>
</field>
<field name="journal_id"/> <field name="journal_id"/>
<field name="pricelist_id"/> <field name="pricelist_id"/>
<separator/> <separator/>