diff --git a/analitic_line_company_rules.diff b/analitic_line_company_rules.diff
new file mode 100644
index 0000000..9cf3f83
--- /dev/null
+++ b/analitic_line_company_rules.diff
@@ -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 @@
+ tree
+ analytic_account_entry_tree
+
++
++
++ User in company
++
++
++
++
++
++
++
++
++
+
+
diff --git a/issue3932.diff b/issue3932.diff
index 447f750..92c8bed 100644
--- a/issue3932.diff
+++ b/issue3932.diff
@@ -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 @@
+ account.aged_balance,-1
+
+
++
++
++
++ Account Journal Period
++
++
++
++
++
++
++
++
++
++
++
+
+
+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 @@
account.move.general_journal
account/general_journal.fodt
diff --git a/sale_number_of_packages.diff b/sale_number_of_packages.diff
deleted file mode 100644
index c04ebd4..0000000
--- a/sale_number_of_packages.diff
+++ /dev/null
@@ -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
diff --git a/series b/series
index 71abfd2..bd63aa9 100644
--- a/series
+++ b/series
@@ -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)
diff --git a/stock_external_party.diff b/stock_external_party.diff
deleted file mode 100644
index 27bdc8f..0000000
--- a/stock_external_party.diff
+++ /dev/null
@@ -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
diff --git a/stock_lot_deactivatable.diff b/stock_lot_deactivatable.diff
deleted file mode 100644
index d66ed34..0000000
--- a/stock_lot_deactivatable.diff
+++ /dev/null
@@ -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