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

removed unussed patches and and new ones

This commit is contained in:
?ngel ?lvarez 2019-04-12 21:46:38 +02:00
parent 79ad25915c
commit fa8dd5c205
6 changed files with 54 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
analitic_line_company_rules.diff Normal file
View File

@ -0,0 +1,24 @@
diff -r 6c1f98f2f997 account.xml
--- a/trytond/trytond/modules/analytic_account/account.xml Sun Apr 07 19:50:02 2019 +0200
+++ b/trytond/trytond/modules/analytic_account/account.xml Fri Apr 12 21:23:20 2019 +0200
@@ -160,5 +160,20 @@
<field name="type">tree</field>
<field name="name">analytic_account_entry_tree</field>
</record>
+
+ <record model="ir.rule.group" id="rule_analytic_account">
+ <field name="name">User in company</field>
+ <field name="model"
+ search="[('model', '=', 'analytic_account.account')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_analytic_account1">
+ <field name="domain"
+ eval="[('company', 'in', Eval('user', {}).get('companies', []))]"
+ pyson="1"/>
+ <field name="rule_group" ref="rule_analytic_account"/>
+ </record>
+
+
</data>
</tryton>

32
issue3932.diff
View File

@ -1,6 +1,32 @@
diff -r 9e1157ee5145 move.xml
--- a/trytond/trytond/modules/account/move.xml Sun Mar 31 00:15:09 2019 +0100
+++ b/trytond/trytond/modules/account/move.xml Thu Apr 04 17:32:07 2019 +0200
diff -r d5e2bdf73e16 account.xml
--- a/trytond/trytond/modules/account/account.xml Sun Apr 07 19:50:02 2019 +0200
+++ b/trytond/trytond/modules/account/account.xml Fri Apr 12 21:43:14 2019 +0200
@@ -747,5 +747,22 @@
<field name="model">account.aged_balance,-1</field>
<field name="action" ref="report_aged_balance"/>
</record>
+
+
+ <record model="ir.rule.group" id="rule_group_account_journal_period">
+ <field name="name">Account Journal Period</field>
+ <field name="model" search="[('model', '=', 'account.journal.period')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_account_journal_period">
+ <field name="domain"
+ eval="[('period.company', '=', Eval('user', {}).get('company', None))]"
+ pyson="1"/>
+ <field name="rule_group" ref="rule_group_account_journal_period"/>
+ </record>
+
+
+
+
</data>
</tryton>
diff -r d5e2bdf73e16 move.xml
--- a//trytond/trytond/modules/account/move.xml Sun Apr 07 19:50:02 2019 +0200
+++ b//trytond/trytond/modules/account/move.xml Fri Apr 12 21:43:14 2019 +0200
@@ -411,5 +411,30 @@
<field name="report_name">account.move.general_journal</field>
<field name="report">account/general_journal.fodt</field>

32
sale_number_of_packages.diff
View File

@ -1,32 +0,0 @@
diff -r 8eadb6e76468 trytond/trytond/modules/sale_number_of_packages/stock.py
--- a/trytond/trytond/modules/sale_number_of_packages/stock.py Mon Dec 03 16:38:23 2018 +0100
+++ b/trytond/trytond/modules/sale_number_of_packages/stock.py Wed Dec 12 14:45:49 2018 +0100
@@ -179,7 +179,8 @@
@classmethod
def compute_quantities_query(cls, location_ids, with_childs=False,
- grouping=('product',), grouping_filter=None):
+ grouping=('product',), grouping_filter=None,
+ quantity_field='internal_quantity'):
pool = Pool()
Lot = pool.get('stock.lot')
lot = Lot.__table__()
@@ -187,7 +188,8 @@
if not Transaction().context.get('normalized_number_of_packages'):
return super(Move, cls).compute_quantities_query(
location_ids, with_childs=with_childs, grouping=grouping,
- grouping_filter=grouping_filter)
+ grouping_filter=grouping_filter,
+ quantity_field=quantity_field)
new_grouping = grouping[:]
new_grouping_filter = (grouping_filter[:] if grouping_filter != None
@@ -199,7 +201,8 @@
query = super(Move, cls).compute_quantities_query(
location_ids, with_childs=with_childs, grouping=new_grouping,
- grouping_filter=new_grouping_filter)
+ grouping_filter=new_grouping_filter,
+ quantity_field=quantity_field)
if not query:
return query

1
series
View File

@ -8,6 +8,7 @@ issue6253.diff # [account_invoice] add invoice type criteria
issue4506.diff # [account_invoice] Add credit invoices keyword from account.invoice
issue4030.diff # [analytic_account] Not selected root accounts in analytic account lines
analitic_.diff # [analytic_account] Not selected root accounts in analytic account lines
sale_list_price.diff # [sale] Can't convert to currency with list price is null (multicompany)

22
stock_external_party.diff
View File

@ -1,22 +0,0 @@
diff -r f7f8e7da9dd8 trytond/trytond/modules/stock_external_party/stock.py
--- a/trytond/trytond/modules/stock_external_party/stock.py Tue Dec 04 13:36:33 2018 +0100
+++ b/trytond/trytond/modules/stock_external_party/stock.py Wed Dec 05 16:24:09 2018 +0100
@@ -155,7 +155,8 @@
@classmethod
def compute_quantities_query(cls, location_ids, with_childs=False,
- grouping=('product',), grouping_filter=None):
+ grouping=('product',), grouping_filter=None,
+ quantity_field='internal_quantity'):
context = Transaction().context
new_grouping = grouping[:]
@@ -168,7 +169,7 @@
query = super(Move, cls).compute_quantities_query(
location_ids, with_childs=with_childs, grouping=new_grouping,
- grouping_filter=new_grouping_filter)
+ grouping_filter=new_grouping_filter, quantity_field=quantity_field)
return query
@classmethod

20
stock_lot_deactivatable.diff
View File

@ -1,20 +0,0 @@
diff -r c8f4cfc59666 trytond/trytond/modules/stock_lot_deactivatable/stock.py
--- a/trytond/trytond/modules/stock_lot_deactivatable/stock.py Wed Dec 12 15:46:19 2018 +0100
+++ b/trytond/trytond/modules/stock_lot_deactivatable/stock.py Wed Dec 12 15:50:28 2018 +0100
@@ -82,13 +82,14 @@
@classmethod
def compute_quantities_query(cls, location_ids, with_childs=False,
- grouping=('product',), grouping_filter=None):
+ grouping=('product',), grouping_filter=None,
+ quantity_field='internal_quantity'):
pool = Pool()
Lot = pool.get('stock.lot')
Period = pool.get('stock.period')
query = super(Move, cls).compute_quantities_query(
location_ids, with_childs=with_childs, grouping=grouping,
- grouping_filter=grouping_filter)
+ grouping_filter=grouping_filter, quantity_field=quantity_field)
if not query or 'lot' not in grouping:
return query