NaNtic
/
trytond-patches
mirror of https://github.com/NaN-tic/trytond-patches.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use PYSON in xml fields and remove not needed patch

This commit is contained in:
Sergi Almacellas Abellana 2015-12-05 19:46:38 +01:00
parent 0a4a1acb1c
commit 51546c3142
6 changed files with 8 additions and 500 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
account_move_line_rule.diff
View File

@ -4,13 +4,13 @@ diff -r 32ceadcd01cd move.xml
@@ -259,6 +259,15 @@
<field name="perm_delete" eval="True"/>
</record>
+ <record model="ir.rule.group" id="rule_group_move_line">
+ <field name="model" search="[('model', '=', 'account.move.line')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_move_line1">
+ <field name="domain">[('account.company', 'in', [c.id for c in user.companies])]</field>
+ <field name="domain" eval="[('account.company', 'in', Eval('user', {}).get('companies', []))]" pyson="1"/>
+ <field name="rule_group" ref="rule_group_move_line"/>
+ </record>
+

491
chart_not_translatable.diff
View File

@ -1,491 +0,0 @@
# HG changeset patch
# User Sergi Almacellas Abellana <sergi@koolpi.com>
# Date 1444057776 -7200
# Mon Oct 05 17:09:36 2015 +0200
# Node ID 53e93ecd5aee050604a332dbee4b76c9e53e9a28
# Parent 72937562d4c14d890bcd5a12d3a29c833775e08f
Make chart of accounts not translatable
issue3432
review21431002
diff -r 72937562d4c1 -r 53e93ecd5aee trytond/trytond/modules/account/account.py
--- a/trytond/trytond/modules/account/account.py Sat Oct 03 12:02:12 2015 +0200
+++ b/trytond/trytond/modules/account/account.py Mon Oct 05 17:09:36 2015 +0200
@@ -43,7 +43,7 @@
class TypeTemplate(ModelSQL, ModelView):
'Account Type Template'
__name__ = 'account.account.type.template'
- name = fields.Char('Name', required=True, translate=True)
+ name = fields.Char('Name', required=True)
parent = fields.Many2One('account.account.type.template', 'Parent',
ondelete="RESTRICT")
childs = fields.One2Many('account.account.type.template', 'parent',
@@ -129,8 +129,6 @@
'''
pool = Pool()
Type = pool.get('account.account.type')
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2type is None:
template2type = {}
@@ -142,24 +140,6 @@
new_type, = Type.create([vals])
- prev_lang = self._context.get('language') or Config.get_language()
- prev_data = {}
- for field_name, field in self._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- template = self.__class__(self.id)
- data = {}
- for field_name, field in template._fields.iteritems():
- if (getattr(field, 'translate', False)
- and (getattr(template, field_name) !=
- prev_data[field_name])):
- data[field_name] = getattr(template, field_name)
- if data:
- Type.write([new_type], data)
template2type[self.id] = new_type.id
new_id = template2type[self.id]
@@ -173,7 +153,7 @@
class Type(ModelSQL, ModelView):
'Account Type'
__name__ = 'account.account.type'
- name = fields.Char('Name', size=None, required=True, translate=True)
+ name = fields.Char('Name', size=None, required=True)
parent = fields.Many2One('account.account.type', 'Parent',
ondelete="RESTRICT", domain=[
('company', '=', Eval('company')),
@@ -294,9 +274,6 @@
value, used to convert template id into type. The dictionary is filled
with new types
'''
- pool = Pool()
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2type is None:
template2type = {}
@@ -306,26 +283,6 @@
if vals:
self.write([self], vals)
- prev_lang = self._context.get('language') or Config.get_language()
- prev_data = {}
- for field_name, field in self.template._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self.template, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- type_ = self.__class__(self.id)
- data = {}
- for field_name, field in (
- type_.template._fields.iteritems()):
- if (getattr(field, 'translate', False)
- and (getattr(type_.template, field_name) !=
- prev_data[field_name])):
- data[field_name] = getattr(type_.template,
- field_name)
- if data:
- self.write([type_], data)
template2type[self.template.id] = self.id
for child in self.childs:
@@ -354,8 +311,7 @@
class AccountTemplate(ModelSQL, ModelView):
'Account Template'
__name__ = 'account.account.template'
- name = fields.Char('Name', size=None, required=True, translate=True,
- select=True)
+ name = fields.Char('Name', size=None, required=True, select=True)
code = fields.Char('Code', size=None, select=True)
type = fields.Many2One('account.account.type.template', 'Type',
ondelete="RESTRICT",
@@ -480,8 +436,6 @@
'''
pool = Pool()
Account = pool.get('account.account')
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2account is None:
template2account = {}
@@ -498,24 +452,6 @@
new_account, = Account.create([vals])
- prev_lang = self._context.get('language') or Config.get_language()
- prev_data = {}
- for field_name, field in self._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- template = self.__class__(self.id)
- data = {}
- for field_name, field in self._fields.iteritems():
- if (getattr(field, 'translate', False)
- and (getattr(template, field_name) !=
- prev_data[field_name])):
- data[field_name] = getattr(template, field_name)
- if data:
- Account.write([new_account], data)
template2account[self.id] = new_account.id
new_id = template2account[self.id]
@@ -562,8 +498,7 @@
class Account(ModelSQL, ModelView):
'Account'
__name__ = 'account.account'
- name = fields.Char('Name', size=None, required=True, translate=True,
- select=True)
+ name = fields.Char('Name', size=None, required=True, select=True)
code = fields.Char('Code', size=None, select=True)
active = fields.Boolean('Active', select=True)
company = fields.Many2One('company.company', 'Company', required=True,
@@ -918,9 +853,6 @@
template2type is a dictionary with type template id as key and type id
as value, used to convert type template id into type.
'''
- pool = Pool()
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2account is None:
template2account = {}
@@ -938,26 +870,6 @@
if vals:
self.write([self], vals)
- prev_lang = self._context.get('language') or Config.get_language()
- prev_data = {}
- for field_name, field in self.template._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self.template, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- account = self.__class__(self.id)
- data = {}
- for field_name, field in (
- account.template._fields.iteritems()):
- if (getattr(field, 'translate', False)
- and (getattr(account.template, field_name) !=
- prev_data[field_name])):
- data[field_name] = getattr(account.template,
- field_name)
- if data:
- self.write([account], data)
template2account[self.template.id] = self.id
for child in self.childs:
diff -r 72937562d4c1 -r 53e93ecd5aee trytond/trytond/modules/account/tax.py
--- a/trytond/trytond/modules/account/tax.py Sat Oct 03 12:02:12 2015 +0200
+++ b/trytond/trytond/modules/account/tax.py Mon Oct 05 17:09:36 2015 +0200
@@ -34,7 +34,7 @@
class TaxGroup(ModelSQL, ModelView):
'Tax Group'
__name__ = 'account.tax.group'
- name = fields.Char('Name', size=None, required=True, translate=True)
+ name = fields.Char('Name', size=None, required=True)
code = fields.Char('Code', size=None, required=True)
kind = fields.Selection(KINDS, 'Kind', required=True)
@@ -56,13 +56,13 @@
class TaxCodeTemplate(ModelSQL, ModelView):
'Tax Code Template'
__name__ = 'account.tax.code.template'
- name = fields.Char('Name', required=True, translate=True)
+ name = fields.Char('Name', required=True)
code = fields.Char('Code')
parent = fields.Many2One('account.tax.code.template', 'Parent')
childs = fields.One2Many('account.tax.code.template', 'parent', 'Children')
account = fields.Many2One('account.account.template', 'Account Template',
domain=[('parent', '=', None)], required=True)
- description = fields.Text('Description', translate=True)
+ description = fields.Text('Description')
@classmethod
def __setup__(cls):
@@ -101,8 +101,6 @@
'''
pool = Pool()
TaxCode = pool.get('account.tax.code')
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2tax_code is None:
template2tax_code = {}
@@ -114,24 +112,9 @@
new_tax_code, = TaxCode.create([vals])
- prev_lang = self._context.get('language') or Config.get_language()
prev_data = {}
for field_name, field in self._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- template = self.__class__(self.id)
- data = {}
- for field_name, field in template._fields.iteritems():
- if (getattr(field, 'translate', False)
- and (getattr(template, field_name) !=
- prev_data[field_name])):
- data[field_name] = getattr(template, field_name)
- if data:
- TaxCode.write([new_tax_code], data)
+ prev_data[field_name] = getattr(self, field_name)
template2tax_code[self.id] = new_tax_code.id
new_id = template2tax_code[self.id]
@@ -145,8 +128,7 @@
class TaxCode(ModelSQL, ModelView):
'Tax Code'
__name__ = 'account.tax.code'
- name = fields.Char('Name', size=None, required=True, select=True,
- translate=True)
+ name = fields.Char('Name', size=None, required=True, select=True)
code = fields.Char('Code', size=None, select=True)
active = fields.Boolean('Active', select=True)
company = fields.Many2One('company.company', 'Company', required=True,
@@ -161,7 +143,7 @@
digits=(16, Eval('currency_digits', 2)), depends=['currency_digits']),
'get_sum')
template = fields.Many2One('account.tax.code.template', 'Template')
- description = fields.Text('Description', translate=True)
+ description = fields.Text('Description')
@classmethod
def __setup__(cls):
@@ -259,9 +241,6 @@
tax code id as value, used to convert template id into tax code. The
dictionary is filled with new tax codes
'''
- pool = Pool()
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2tax_code is None:
template2tax_code = {}
@@ -270,26 +249,6 @@
vals = self.template._get_tax_code_value(code=self)
if vals:
self.write([self], vals)
-
- prev_lang = self._context.get('language') or Config.get_language()
- prev_data = {}
- for field_name, field in self.template._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self.template, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- code = self.__class__(self.id)
- data = {}
- for field_name, field in code.template._fields.iteritems():
- if (getattr(field, 'translate', False)
- and (getattr(code.template, field_name) !=
- prev_data[field_name])):
- data[field_name] = getattr(code.template,
- field_name)
- if data:
- self.write([code], data)
template2tax_code[self.template.id] = self.id
for child in self.childs:
@@ -353,8 +312,8 @@
class TaxTemplate(ModelSQL, ModelView):
'Account Tax Template'
__name__ = 'account.tax.template'
- name = fields.Char('Name', required=True, translate=True)
- description = fields.Char('Description', required=True, translate=True)
+ name = fields.Char('Name', required=True)
+ description = fields.Char('Description', required=True)
group = fields.Many2One('account.tax.group', 'Group')
sequence = fields.Integer('Sequence')
start_date = fields.Date('Starting Date')
@@ -514,8 +473,6 @@
'''
pool = Pool()
Tax = pool.get('account.tax')
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2tax is None:
template2tax = {}
@@ -557,24 +514,6 @@
new_tax, = Tax.create([vals])
- prev_lang = self._context.get('language') or Config.get_language()
- prev_data = {}
- for field_name, field in self._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- template = self.__class__(self.id)
- data = {}
- for field_name, field in template._fields.iteritems():
- if (getattr(field, 'translate', False)
- and (getattr(template, field_name)
- != prev_data[field_name])):
- data[field_name] = getattr(template, field_name)
- if data:
- Tax.write([new_tax], data)
template2tax[self.id] = new_tax.id
new_id = template2tax[self.id]
@@ -596,8 +535,8 @@
none: tax = none
'''
__name__ = 'account.tax'
- name = fields.Char('Name', required=True, translate=True)
- description = fields.Char('Description', required=True, translate=True,
+ name = fields.Char('Name', required=True)
+ description = fields.Char('Description', required=True,
help="The name that will be used in reports")
group = fields.Many2One('account.tax.group', 'Group',
states={
@@ -945,9 +884,6 @@
value, used to convert template id into tax. The dictionary is filled
with new taxes.
'''
- pool = Pool()
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2tax is None:
template2tax = {}
@@ -1018,25 +954,6 @@
if vals:
self.write([self], vals)
- prev_lang = self._context.get('language') or Config.get_language()
- prev_data = {}
- for field_name, field in self.template._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self.template, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- tax = self.__class__(self.id)
- data = {}
- for field_name, field in tax.template._fields.iteritems():
- if (getattr(field, 'translate', False)
- and (getattr(tax.template, field_name)
- != prev_data[field_name])):
- data[field_name] = getattr(tax.template,
- field_name)
- if data:
- self.write([tax], data)
template2tax[self.template.id] = self.id
for child in self.childs:
@@ -1195,7 +1112,7 @@
class TaxRuleTemplate(ModelSQL, ModelView):
'Tax Rule Template'
__name__ = 'account.tax.rule.template'
- name = fields.Char('Name', required=True, translate=True)
+ name = fields.Char('Name', required=True)
kind = fields.Selection(KINDS, 'Kind', required=True)
lines = fields.One2Many('account.tax.rule.line.template', 'rule', 'Lines')
account = fields.Many2One('account.account.template', 'Account Template',
@@ -1228,8 +1145,6 @@
'''
pool = Pool()
Rule = pool.get('account.tax.rule')
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2rule is None:
template2rule = {}
@@ -1239,24 +1154,6 @@
vals['company'] = company_id
new_rule, = Rule.create([vals])
- prev_lang = self._context.get('language') or Config.get_language()
- prev_data = {}
- for field_name, field in self._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- template = self.__class__(self.id)
- data = {}
- for field_name, field in template._fields.iteritems():
- if (getattr(field, 'translate', False)
- and (getattr(self, field_name)
- != prev_data[field_name])):
- data[field_name] = getattr(self, field_name)
- if data:
- Rule.write([new_rule], data)
template2rule[self.id] = new_rule.id
return template2rule[self.id]
@@ -1264,7 +1161,7 @@
class TaxRule(ModelSQL, ModelView):
'Tax Rule'
__name__ = 'account.tax.rule'
- name = fields.Char('Name', required=True, translate=True)
+ name = fields.Char('Name', required=True)
kind = fields.Selection(KINDS, 'Kind', required=True)
company = fields.Many2One('company.company', 'Company', required=True,
select=True, domain=[
@@ -1305,9 +1202,6 @@
rule id as value, used to convert template id into tax rule. The
dictionary is filled with new tax rules.
'''
- pool = Pool()
- Lang = pool.get('ir.lang')
- Config = pool.get('ir.configuration')
if template2rule is None:
template2rule = {}
@@ -1317,25 +1211,6 @@
if vals:
self.write([self], vals)
- prev_lang = self._context.get('language') or Config.get_language()
- prev_data = {}
- for field_name, field in self.template._fields.iteritems():
- if getattr(field, 'translate', False):
- prev_data[field_name] = getattr(self.template, field_name)
- for lang in Lang.get_translatable_languages():
- if lang == prev_lang:
- continue
- with Transaction().set_context(language=lang):
- rule = self.__class__(self.id)
- data = {}
- for field_name, field in rule.template._fields.iteritems():
- if (getattr(field, 'translate', False)
- and (getattr(rule.template, field_name)
- != prev_data[field_name])):
- data[field_name] = getattr(rule.template,
- field_name)
- if data:
- self.write([rule], data)
template2rule[self.template.id] = self.id

8
issue10091002_1.diff
View File

@ -13,11 +13,11 @@ Index: invoice.xml
@@ -38,6 +38,17 @@
<field name="act_window" ref="act_invoice_form"/>
</record>
+ <record model="ir.action.act_window" id="act_credit_notes_form">
+ <field name="name">Credit Notes</field>
+ <field name="res_model">account.invoice</field>
+ <field name="domain">[('lines.origin.invoice', 'in', Eval('active_ids'), 'account.invoice.line')]</field>
+ <field name="domain" eval="[('lines.origin.invoice', 'in', Eval('active_ids'), 'account.invoice.line')]" pyson="1"/>
+ </record>
+ <record model="ir.action.keyword" id="act_open_credit_notes_keyword1">
+ <field name="keyword">form_relate</field>
@ -38,7 +38,7 @@ Index: ca_ES.xml
@@ -1053,6 +1053,10 @@
msgid "Invoices"
msgstr "Factures"
+msgctxt "model:ir.action,name:act_credit_notes_form"
+msgid "Credit Notes"
+msgstr "Abonaments"
@ -56,7 +56,7 @@ Index: ca_ES.xml
@@ -1045,6 +1045,10 @@
msgid "Invoices"
msgstr "Todas las facturas"
+msgctxt "model:ir.action,name:act_credit_notes_form"
+msgid "Credit Notes"
+msgstr "Abonos"

2
issue13891002_20001.diff
View File

@ -19,7 +19,7 @@ Index: trytond/trytond/modules/stock/inventory.xml
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_inventory">
+ <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
+ <field name="domain" eval="[('company', 'in', Eval('user', {}).get('companies', []))]" pyson="1"/>
+ <field name="rule_group" ref="rule_group_inventory"/>
+ </record>
+

2
issue6341003_1.diff
View File

@ -12,7 +12,7 @@ Index: trytond/trytond/modules/account_asset/asset.xml
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_asset_line1">
+ <field name="domain">[('asset.company', '=', user.company.id if user.company else None)]</field>
+ <field name="domain" eval="[('asset.company', 'in', Eval('user', {}).get('companies', []))]" pyson="1"/>
+ <field name="rule_group" ref="rule_group_asset_line"/>
+ </record>
+

1
series
View File

@ -39,7 +39,6 @@ issue18801002_1.diff
#account_chart_speedup.diff
# Uncomment in calfruitos
#fix_rounding_in_sync_inventory_to_outgoing.patch
#chart_not_translatable.diff
#024726_account_bank_remove_company.diff
#024726_account_payment_type_remove_company.diff
#stock_lot_improve_sync_inventory_to_outgoing.diff