Add modules sale_from_private_stock and sale_order_add_bom

Port base_company_extension to v10
Avoid blockage on l10n_fr_infogreffe_connector
This commit is contained in:
Alexis de Lattre
2016-10-11 17:46:53 +02:00
parent 79a093e250
commit f50a10c637
3 changed files with 10 additions and 11 deletions

View File

@@ -35,11 +35,11 @@ This module adds 2 fields on the Company :
* *Capital Amount* * *Capital Amount*
* *Legal Form* (technical name: title, configured as a related field of res.partner) * *Legal Form*
""", """,
'author': 'Akretion', 'author': 'Akretion',
'website': 'http://www.akretion.com', 'website': 'http://www.akretion.com',
'depends': ['base'], 'depends': ['base'],
'data': ['company_view.xml'], 'data': ['company_view.xml'],
'installable': False, 'installable': True,
} }

View File

@@ -26,10 +26,10 @@ from openerp import models, fields
class ResCompany(models.Model): class ResCompany(models.Model):
_inherit = "res.company" _inherit = "res.company"
capital_amount = fields.Integer(string='Capital Amount') capital_amount = fields.Monetary(string='Capital Amount')
title = fields.Many2one( # in v9, title is only for contacts, not for companies
'res.partner.title', related='partner_id.title', legal_type = fields.Char(
string='Legal Form') string="Legal Type", help="Type of Company, e.g. SARL, SAS, ...")
_sql_constraints = [( _sql_constraints = [(
'capital_amount_positive', 'capital_amount_positive',

View File

@@ -6,7 +6,7 @@
The licence is in the file __openerp__.py The licence is in the file __openerp__.py
--> -->
<openerp> <odoo>
<data> <data>
<record id="view_company_form" model="ir.ui.view"> <record id="view_company_form" model="ir.ui.view">
@@ -15,13 +15,12 @@
<field name="inherit_id" ref="base.view_company_form" /> <field name="inherit_id" ref="base.view_company_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="company_registry" position="after"> <field name="company_registry" position="after">
<field name="capital_amount" widget="monetary" <field name="capital_amount"/>
options="{'currency_field': 'currency_id'}"/> <field name="legal_type"/>
<field name="title" domain="[('domain', '=', 'partner')]"/>
</field> </field>
</field> </field>
</record> </record>
</data> </data>
</openerp> </odoo>