tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://gitlab.datenpol.at:122/odoo/tz-austria into develop

develop
Andreas Brückl 2017-12-07 16:20:58 +01:00
parent 27278f8288 f93ccbda51
commit 3f644e084e
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/custom-addons/dp_custom/data/glaser_company_data.xml
View File

@ -13,9 +13,12 @@
<field name="country_id" search="[('code','=','AT')]"/> <field name="country_id" search="[('code','=','AT')]"/>
<field name="vat">ATU17860303</field> <field name="vat">ATU17860303</field>
<field name="vat_check_vies" eval="False"/> <field name="vat_check_vies" eval="False"/>
<field name="supplier" eval="True"/>
</record> </record>
<function id="set_company_supplier" model="res.company" name="set_company_supplier">
<value eval="[ref('glaser_and_co_company')]"/>
</function>
<function id="set_company_logo" model="res.company" name="set_company_logo"> <function id="set_company_logo" model="res.company" name="set_company_logo">
<value eval="[ref('glaser_and_co_company')]"/> <value eval="[ref('glaser_and_co_company')]"/>
<value>../static/src/img/logo_glaser.png</value> <value>../static/src/img/logo_glaser.png</value>

4
ext/custom-addons/dp_custom/data/tz_austria_company_data.xml
View File

@ -16,4 +16,8 @@
(4,ref('queue_job.group_queue_job_manager'))]"/> (4,ref('queue_job.group_queue_job_manager'))]"/>
</record> </record>
<function id="set_company_customer" model="res.company" name="set_company_customer">
<value eval="[ref('base.main_company')]"/>
</function>
</odoo> </odoo>

8
ext/custom-addons/dp_custom/models/res_company.py
View File

@ -36,6 +36,14 @@ class Company(models.Model):
fi.close() fi.close()
self.browse(company).write({'logo': content}) self.browse(company).write({'logo': content})
@api.model
def set_company_supplier(self, company):
self.browse(company).partner_id.supplier = True
@api.model
def set_company_customer(self, company):
self.browse(company).partner_id.customer = True
@api.model @api.model
def set_company_favicon(self, company, logo): def set_company_favicon(self, company, logo):
filename = os.path.join(os.path.dirname(os.path.realpath(__file__)), logo) filename = os.path.join(os.path.dirname(os.path.realpath(__file__)), logo)

8
ext/custom-addons/dp_custom/models/sale.py
View File

@ -198,6 +198,14 @@ class SaleOrderLine(models.Model):
from_designbox = fields.Boolean(string='Import von Designbox', readonly=True) from_designbox = fields.Boolean(string='Import von Designbox', readonly=True)
product_id = fields.Many2one(domain=[('sale_ok', '=', True), ('can_be_sold_unconfigured', '=', True)]) product_id = fields.Many2one(domain=[('sale_ok', '=', True), ('can_be_sold_unconfigured', '=', True)])
@api.multi
def write(self, vals):
for record in self:
if record.from_designbox and set(vals.keys()).intersection(
['product_uom_qty', 'product_uom', 'price_unit']):
raise ValidationError(_("Menge und Preis können von Produkten aus der Designbox nicht geändert werden"))
return super(SaleOrderLine, self).write(vals)
@api.model @api.model
def correct_values(self, vals): def correct_values(self, vals):
if vals.get('product_id', False): if vals.get('product_id', False):