diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
| commit | baf494c67ba7ecba331b24bcfa5eed9bde8a16da (patch) | |
| tree | 3b2c9ec3cacabcf0a5b0fb78a667d5e1b27505dc /addons/website_quote/models/order.py | |
| parent | 133490b4d0e347d75bab20da8e5e0ad1f95d3a2d (diff) | |
| parent | 1d81bb06a47b1aee1b7a0dcdaa03084ddedf8b7b (diff) | |
[MERGE] forward port of branch saas-9 up to 1d81bb0
# Conflicts:
# addons/account_extra_reports/i18n/ca.po
# addons/account_extra_reports/i18n/fi.po
# addons/account_extra_reports/i18n/pl.po
# addons/account_extra_reports/i18n/te.po
# addons/account_extra_reports/i18n/zh_CN.po
# addons/account_full_reconcile/i18n/hu.po
# addons/account_full_reconcile/i18n/pl.po
# addons/crm/crm_lead_menu.xml
# addons/crm_claim/i18n/es_PE.po
# addons/crm_claim/i18n/hu.po
# addons/crm_claim/i18n/ja.po
# addons/crm_claim/i18n/pl.po
# addons/delivery/views/delivery_view.xml
# addons/product/product_view.xml
# addons/project_timesheet/i18n/es_PE.po
# addons/stock/stock_view.xml
Diffstat (limited to 'addons/website_quote/models/order.py')
| -rw-r--r-- | addons/website_quote/models/order.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py index 8f89b77cb04..785e7a2ef73 100644 --- a/addons/website_quote/models/order.py +++ b/addons/website_quote/models/order.py @@ -229,6 +229,7 @@ class sale_order(osv.osv): 'website_description': line.website_description, 'state': 'draft', 'customer_lead': self._get_customer_lead(cr, uid, line.product_id.product_tmpl_id), + 'delay': line.product_id.sale_delay }) lines.append((0, 0, data)) options = [] |