Merge lp:~juanalfonso/openobject-addons/7.0-account-journal-form-visualization into lp:openobject-addons/7.0

[Juan A. Pérez Ruiz (Otherway)]

A new <newline/> tag is included in the account.journal form due to that some fields not see directly without use horizontal scroll. This can lead to confusion when setting the account journals.

Unmerged revisions

9799. By Juan A. Pérez Ruiz (Otherway) on 2014-01-30

Integration

9798. By Juan A. Pérez Ruiz (Otherway) on 2014-01-30

A new <newline/> tag is included in the account.journal form due to that some fields not see directly without use horizontal scroll.

9797. By Juan A. Pérez Ruiz (Otherway) on 2014-01-27

In the picking reports a for statement have been removed in order to include the reports stock.picking.list.in and stock.picking.list.out in translation template pot.

9796. By Juan A. Pérez Ruiz (Otherway) on 2014-01-27

Added missing translations in es.po for report stock.picking.list.in and stock.picking.list.out

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2013-09-03 07:07:07 +0000
+++ account/account_view.xml	2014-01-30 12:36:24 +0000
@@ -397,6 +397,7 @@
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
                     </div>
+                    <newline/>
                     <group>
                         <group>
                             <field name="code"/>

=== modified file 'stock/report/picking.py'
--- stock/report/picking.py	2013-08-23 13:12:14 +0000
+++ stock/report/picking.py	2014-01-30 12:36:24 +0000
@@ -35,9 +35,18 @@
             desc = '[' + move_line.product_id.default_code + ']' + ' ' + desc
         return desc
 
-for suffix in ['', '.in', '.out']:
-    report_sxw.report_sxw('report.stock.picking.list' + suffix,
-                          'stock.picking' + suffix,
-                          'addons/stock/report/picking.rml',
-                          parser=picking)
+report_sxw.report_sxw('report.stock.picking.list',
+                      'stock.picking',
+                      'addons/stock/report/picking.rml',
+                      parser=picking)
+
+report_sxw.report_sxw('report.stock.picking.list.in',
+                      'stock.picking.in',
+                      'addons/stock/report/picking.rml',
+                      parser=picking)
+
+report_sxw.report_sxw('report.stock.picking.list.out',
+                      'stock.picking.out',
+                      'addons/stock/report/picking.rml',
+                      parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: