som fixes on patches

This commit is contained in:
?ngel ?lvarez 2019-06-10 21:24:52 +02:00
parent 69c7751a46
commit dff3e6d015
3 changed files with 14 additions and 10 deletions

View File

@ -17,7 +17,7 @@ diff -r 99ab023bae5d src/view/tree.js
- init: function(screen, attributes) {
- this.screen = screen;
+ init: function(view, attributes) {
+ this.screen = view;
+ this.view = view;
this.type = 'button';
this.attributes = attributes;
},

View File

@ -1,17 +1,19 @@
diff -r 74028491a4a5 view/production_form.xml
--- a/trytond/trytond/modules/production/view/production_form.xml Mon May 06 15:06:40 2019 +0200
+++ b/trytond/trytond/modules/production/view/production_form.xml Sun Jun 09 18:04:23 2019 +0200
@@ -19,9 +19,11 @@
+++ b/trytond/trytond/modules/production/view/production_form.xml Mon Jun 10 11:46:50 2019 +0200
@@ -19,10 +19,12 @@
<label name="uom"/>
<field name="uom"/>
<notebook>
- <page string="Lines" id="lines">
+ <page name="inputs" id="inputs">
<field name="inputs" colspan="2"/>
- <field name="inputs" colspan="2"/>
- <field name="outputs" colspan="2"/>
+ </page>
+ <page name="outputs" id="lines">
+ <field name="outputs" colspan="2"/>
+ <page name="inputs" id="inputs">
+ <field name="inputs" colspan="2"/>
</page>
+ <page string="outputs" id="lines">
+ <field name="outputs" colspan="2"/>
+ </page>
<page string="Other Info" id="other">
<label name="company"/>
<field name="company"/>

6
series
View File

@ -27,8 +27,10 @@ issue8394.diff # [stock_lot_sled] Allow configuring which quantity is grouped in
issue10467.diff # [stock_lot] add lot to grouping when assign try if lot it's required on product
party_identifier_migration.diff # [Party] avoid errors on upgrades
production_view.diff [production] Split inputs and outputs on pages
issue8413.diff [carrier] Add recname to search
issue8413.diff # [carrier] Add recname to search
production_view.diff #[production] Split inputs and outputs on pages
# Sao