Merge branch '11.0' into 11.0-test

This commit is contained in:
Jared Kipe
2019-07-14 14:05:27 -07:00
3 changed files with 3 additions and 3 deletions

View File

@@ -136,7 +136,7 @@ class SaleOrderImportMapper(Component):
@mapping
def project_id(self, record):
if self.backend_record.analytic_account_id:
return {'project_id': self.backend_record.analytic_account_id.id}
return {'analytic_account_id': self.backend_record.analytic_account_id.id}
@mapping
def warehouse_id(self, record):

View File

@@ -30,7 +30,7 @@ class WalmartPickingExporter(Component):
ship_date_time = int(fields.Datetime.from_string(ship_date).strftime('%s')) * 1000
lines = []
for line in binding.move_lines:
sale_line = line.procurement_id.sale_line_id
sale_line = line.sale_line_id
if not sale_line.walmart_bind_ids:
continue
# this is a particularly interesting way to get this,