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

Feedback 1620: Der Intrastrat Code kann nur gesetzt werden wenn ein Lot angegeben wurde.

develop
Ahmed Aly 2018-04-19 13:49:17 +02:00
parent c1320165cc
commit d80affb501
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/custom-addons/dp_custom/models/account.py
View File

@ -31,7 +31,7 @@ class AccountInvoiceLine(models.Model):
@api.model @api.model
def create(self, vals): def create(self, vals):
if vals.get('intrastat_id', None) is None: if not vals.get('intrastat_id', False):
if vals.get('lot_id', False): if vals.get('lot_id', False):
vals.update(intrastat_id=self.env['stock.production.lot'].browse(vals['lot_id']).intrastat_id.id) vals.update(intrastat_id=self.env['stock.production.lot'].browse(vals['lot_id']).intrastat_id.id)
elif vals.get('product_id', False): elif vals.get('product_id', False):
@ -57,7 +57,7 @@ class AccountInvoiceLine(models.Model):
for record in self: for record in self:
lot_id = record.lot_id if 'lot_id' not in vals else vals.get('lot_id', False) lot_id = record.lot_id if 'lot_id' not in vals else vals.get('lot_id', False)
if vals.get('intrastat_id', False) and lot_id: if vals.get('intrastat_id', False) and lot_id:
self.env['stock.production.lot'].browse([vals.get('lot_id', False)]).write({ self.env['stock.production.lot'].browse([lot_id.id]).write({
'intrastat_id': vals.get('intrastat_id') 'intrastat_id': vals.get('intrastat_id')
}) })
elif vals.get('intrastat_id', False) and not lot_id: elif vals.get('intrastat_id', False) and not lot_id:

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

@ -397,7 +397,7 @@ class SaleOrderLine(models.Model):
@api.model @api.model
def create(self, vals): def create(self, vals):
if vals.get('intrastat_id', None) is None: if not vals.get('intrastat_id', False):
if vals.get('lot_id', False): if vals.get('lot_id', False):
vals.update(intrastat_id=self.env['stock.production.lot'].browse(vals['lot_id']).intrastat_id.id) vals.update(intrastat_id=self.env['stock.production.lot'].browse(vals['lot_id']).intrastat_id.id)
elif vals.get('product_id', False): elif vals.get('product_id', False):
@ -409,7 +409,7 @@ class SaleOrderLine(models.Model):
for record in self: for record in self:
lot_id = record.lot_id if 'lot_id' not in vals else vals.get('lot_id', False) lot_id = record.lot_id if 'lot_id' not in vals else vals.get('lot_id', False)
if vals.get('intrastat_id', False) and lot_id: if vals.get('intrastat_id', False) and lot_id:
self.env['stock.production.lot'].browse([vals.get('lot_id', False)]).write({ self.env['stock.production.lot'].browse([lot_id.id]).write({
'intrastat_id': vals.get('intrastat_id') 'intrastat_id': vals.get('intrastat_id')
}) })
elif vals.get('intrastat_id', False) and not lot_id: elif vals.get('intrastat_id', False) and not lot_id:

1
setup/lib/config.py
View File

@ -126,6 +126,7 @@ class Config(object):
'dp_reports_sale', 'dp_reports_sale',
'dp_reports_account', 'dp_reports_account',
'dp_reports_purchase', 'dp_reports_purchase',
'dp_reports_stock',
# 'dp_reports_stock', # 'dp_reports_stock',
'account_cancel', 'account_cancel',
'stock', 'stock',