pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-14 up to caea203ba6

Browse Source
This commit is contained in:
Christophe Simonis
2018-02-22 18:59:43 +01:00
parent ad3cc1b231 caea203ba6
commit 9cfd4a5c07
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MANIFEST.in
+5
View File
@@ -4,6 +4,7 @@ include README.md
recursive-include odoo *.css recursive-include odoo *.css
recursive-include odoo *.csv recursive-include odoo *.csv
recursive-include odoo *.doc recursive-include odoo *.doc
recursive-include odoo *.docx
recursive-include odoo *.eml recursive-include odoo *.eml
recursive-include odoo *.eot recursive-include odoo *.eot
recursive-include odoo *.gif recursive-include odoo *.gif
@@ -16,6 +17,8 @@ recursive-include odoo *.less
recursive-include odoo *.md recursive-include odoo *.md
recursive-include odoo *.mp3 recursive-include odoo *.mp3
recursive-include odoo *.ogg recursive-include odoo *.ogg
recursive-include odoo *.ods
recursive-include odoo *.odt
recursive-include odoo *.otf recursive-include odoo *.otf
recursive-include odoo *.pdf recursive-include odoo *.pdf
recursive-include odoo *.png recursive-include odoo *.png
@@ -35,7 +38,9 @@ recursive-include odoo *.wsdl
recursive-include odoo *.xls recursive-include odoo *.xls
recursive-include odoo *.xsd recursive-include odoo *.xsd
recursive-include odoo *.xsl recursive-include odoo *.xsl
recursive-include odoo *.xlsx
recursive-include odoo *.xml recursive-include odoo *.xml
recursive-include odoo *.yml recursive-include odoo *.yml
recursive-include odoo *.zip
recursive-exclude * *.py[co] recursive-exclude * *.py[co]
recursive-exclude * *.hg* recursive-exclude * *.hg*
addons/purchase/views/account_invoice_views.xml
+1 -1
View File
@@ -59,7 +59,7 @@
<field name="inherit_id" ref="account.invoice_supplier_form"/> <field name="inherit_id" ref="account.invoice_supplier_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="reference" position="after" > <field name="reference" position="after" >
<field name="purchase_id" attrs="{'readonly': [('state','not in',['draft'])], 'invisible': [('state', '=', 'purchase')]}" class="oe_edit_only" <field name="purchase_id" attrs="{'readonly': [('state','not in',['draft'])], 'invisible': ['|', ('state', '=', 'purchase'), ('type', '=', 'in_refund')]}" class="oe_edit_only"
options="{'no_create': True}"/> options="{'no_create': True}"/>
</field> </field>
<xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='company_id']" position="after"> <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='company_id']" position="after">
addons/website_quote/models/sale_order.py
+10 -8
View File
@@ -55,6 +55,15 @@ class SaleOrder(models.Model):
def _get_default_template_id(self): def _get_default_template_id(self):
return self.env.ref('website_quote.website_quote_template_default', raise_if_not_found=False) return self.env.ref('website_quote.website_quote_template_default', raise_if_not_found=False)
def _default_require_payment(self):
default_template = self._get_default_template_id()
if self.template_id:
return self.template_id.require_payment
elif default_template:
return default_template.require_payment
else:
return 0
access_token = fields.Char( access_token = fields.Char(
'Security Token', copy=False, default=lambda self: str(uuid.uuid4()), 'Security Token', copy=False, default=lambda self: str(uuid.uuid4()),
required=True) required=True)
@@ -74,14 +83,7 @@ class SaleOrder(models.Model):
(0, 'Not mandatory on website quote validation'), (0, 'Not mandatory on website quote validation'),
(1, 'Immediate after website order validation'), (1, 'Immediate after website order validation'),
(2, 'Immediate after website order validation and save a token'), (2, 'Immediate after website order validation and save a token'),
], 'Payment', help="Require immediate payment by the customer when validating the order from the website quote", compute='_compute_require_payment', store=True) ], 'Payment', help="Require immediate payment by the customer when validating the order from the website quote", default=_default_require_payment)
@api.one
@api.depends('template_id')
def _compute_require_payment(self):
# Do not overwrite if the field is already set
if self.template_id and (self.require_payment is None or self.require_payment is False):
self.require_payment = self.template_id.require_payment
@api.multi @api.multi
def copy(self, default=None): def copy(self, default=None):