This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- if "project_expense_type" in res and "selection" in attributes: | |
- self.env.cr.execute( | |
- f""" | |
-SELECT DISTINCT t.project_expense_type | |
-FROM {self._table} t | |
-LEFT JOIN product_product p ON p.id = t.project_expense_type | |
-LEFT JOIN product_template pt ON pt.id = p.product_tmpl_id | |
-WHERE project_expense_type IS NOT NULL | |
- """ | |
- ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/payment_bepaid/models/payment_bepaid.py b/payment_bepaid/models/payment_bepaid.py | |
index 771e220..63664bf 100644 | |
--- a/payment_bepaid/models/payment_bepaid.py | |
+++ b/payment_bepaid/models/payment_bepaid.py | |
@@ -51,7 +51,7 @@ class AcquirerBepaid(models.Model): | |
"language": "ru", | |
"customer_fields": { | |
"visible": ["first_name", "last_name"], | |
- "read_only": ["email"], | |
+ "read_only": [], |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml | |
index c52f073..80e6e21 100644 | |
--- a/.pre-commit-config.yaml | |
+++ b/.pre-commit-config.yaml | |
@@ -12,6 +12,8 @@ exclude: | | |
/static/(src/)?lib/| | |
# Repos using Sphinx to generate docs don't need prettying | |
^docs/_templates/.*\.html$| | |
+ # всякая *уйня | |
+ ^sh_pos_all_in_one_retail| |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py | |
index d4f40d72..0c5eeb11 100644 | |
--- a/addons/website/controllers/main.py | |
+++ b/addons/website/controllers/main.py | |
@@ -112,7 +112,7 @@ class Website(Home): | |
if domain_from != domain_to: | |
# redirect to correct domain for a correct routing map | |
url_to = werkzeug.urls.url_join(website._get_http_domain(), '/website/force/%s?isredir=1&path=%s' % (website.id, path)) | |
- return request.redirect(url_to) | |
+ return request.redirect(url_to, local=False) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
from odoo import api, fields, models | |
class PosInvoiceReport(models.Model): | |
_inherit = "pos.invoice.report" | |
sales_per_invoice_count = fields.Float( | |
group_operator="SUM(price_subtotal)/COUNT(DISTINCT inv_id)+", | |
string="Sales per invoice count", | |
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/addons/web/static/src/views/helpers/sample_server.js b/addons/web/static/src/views/helpers/sample_server.js | |
index 63b090149c1..41ee14b88af 100644 | |
--- a/addons/web/static/src/views/helpers/sample_server.js | |
+++ b/addons/web/static/src/views/helpers/sample_server.js | |
@@ -309,7 +309,7 @@ export class SampleServer { | |
*/ | |
_getRandomDate(format) { | |
const delta = Math.floor((Math.random() - Math.random()) * SampleServer.DATE_DELTA); | |
- return luxon.DateTime.local().plus({ hours: delta }).toFormat(format); | |
+ return luxon.DateTime.local().plus({ hours: delta }).toFormat(format, {numberingSystem: 'latn'}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
from odoo import api, fields, models | |
class ProductTemplate(models.Model): | |
_inherit = "product.template" | |
engrus_name = fields.Char(compute="_compute_translated_names") | |
vi_name = fields.Char(compute="_compute_translated_names") | |
en_name = fields.Char(compute="_compute_translated_names") | |
ru_name = fields.Char(compute="_compute_translated_names") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/env python3 | |
from pprint import pprint | |
from time import sleep | |
import xml.etree.ElementTree as ET | |
def write_header(f): | |
f.write('''<?xml version="1.0" encoding="UTF-8"?> | |
<odoo> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# пишет, какие файлы поменялись по сравнению с веткой 11.0 | |
git diff --name-only 11.0 | grep -v ".po" | grep "/" | sed 's/\/.*//' | sort -u | |
# можно еще так, чтобы сразу test_*.py | |
git diff --name-only 11.0 | grep -v ".po" | grep "/" | sed 's/\/.*//' | sort -u | sed 's/.*/"\0",/' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# ORGANIZATION GITHUB URL | |
ORG=it-projects-llc | |
UPSTREAM_URL_GIT=https://github.com/$ORG | |
# DEVELOPER INFO | |
USERNAME=em230418 | |
# WHERE TO CLONE |
NewerOlder