Feedback: 1127, 1125, 1126

develop
Ahmed Aly 2017-11-29 13:05:20 +01:00
parent 3b9296035c
commit 1fd4949ddc
5 changed files with 43 additions and 3 deletions

View File

@ -38,6 +38,7 @@
'data/dp_custom_data.xml',
'data/glaser_company_data.xml',
'data/tz_austria_company_data.xml',
'data/cron_job.xml',
'views/dp_custom_views.xml',
'views/res_line_views.xml',
'views/res_partner_views.xml',

View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo noupdate="1">
<record id="cron_export_portal_prices_tz" forcecreate='True' model="ir.cron">
<field name="name">Export Portal Prices TZ</field>
<field eval="False" name="active"/>
<field name="nextcall" eval="DateTime(2017,1,1,1,0,0)" />
<field name="user_id" ref="dp_custom.tz_admin_user"/>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="model_id" ref="base.model_res_partner"/>
<field name="state">code</field>
<field name="code">model.cron_export_portal_prices()
</field>
</record>
<record id="cron_export_portal_prices_glaser" forcecreate='True' model="ir.cron">
<field name="name">Export Portal Prices Glaser</field>
<field eval="False" name="active"/>
<field name="nextcall" eval="DateTime(2017,1,1,1,0,0)" />
<field name="user_id" ref="dp_custom.glaser_admin_user"/>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="model_id" ref="base.model_res_partner"/>
<field name="state">code</field>
<field name="code">model.cron_export_portal_prices()
</field>
</record>
</odoo>

View File

@ -32,7 +32,8 @@
(4,ref('stock.group_stock_manager')),
(4,ref('base.group_system')),
(4,ref('base.group_partner_manager')),
(4,ref('account.group_account_user'))]"/>
(4,ref('account.group_account_user')),
(4,ref('queue_job.group_queue_job_manager'))]"/>
</record>
<!--<function-->

View File

@ -12,7 +12,8 @@
(4,ref('stock.group_stock_manager')),
(4,ref('base.group_system')),
(4,ref('base.group_partner_manager')),
(4,ref('account.group_account_user'))]"/>
(4,ref('account.group_account_user')),
(4,ref('queue_job.group_queue_job_manager'))]"/>
</record>
</odoo>

View File

@ -139,6 +139,13 @@ class Partner(models.Model):
else:
return super(Partner, self)._get_specified_fields()
@api.model
def cron_export_portal_prices(self):
partners = self.search([('portal_export_pending', '=', True), ('company_id', '=', self.env.user.company_id.id)])
for partner in partners:
self.with_delay().job_export_portal_price(partner)
partner.portal_export_pending = False
@api.multi
@job
def job_export_portal_price(self, partner_id):
@ -148,7 +155,7 @@ class Partner(models.Model):
data = {'portal_id': partner_id.portal_id,
'rules': []
}
for item in pricelist.itemd_ids:
for item in pricelist.items_ids:
if item.compute_price == 'percentage' and item.applied_on in ['3_global', '2_product_category',
'1_product']:
category_code = item.product_tmpl_id.categ_id.code if item.applied_on == '2_product_category' else False