Merge lp:kmsistemas-openerp-addons into lp:ocb-addons/6.1

[Jordi Llinares - KM Sistemas]

[FIX] Fix of bug 1256619, where report_stock_inventory class had 'month' field wrongly declared and two fields missing in SQL view.

Regarding to Pedro's question related to my previous MP (which I have just deleted), the answer is Eclipse's "Auto-format editor contents before saving". I had purposely checked this quite a long time ago because I liked that feature. But when it comes to collaboration, I failed noticing all those space-after-comma unintentional changes. Just disabled it.

My bad, won't happen again. Regards.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks, looking good!

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

Jordi, thanks for the fix!

Regards.

review: Approve (code review)

[Omar (Pexego) (omar7r)]

LGTM

review: Approve (code review)

[lp:kmsistemas-openerp-addons]

6822. By Jordi Llinares - KM Sistemas on 2013-12-13

[FIX] stock: Fix of bug 1256619, where report_stock_inventory class had 'month' field wrongly declared and two fields missing in SQL view.

=== modified file 'stock/report/report_stock_move.py'
--- stock/report/report_stock_move.py	2013-04-04 12:46:09 +0000
+++ stock/report/report_stock_move.py	2013-12-10 08:43:28 +0000
@@ -153,7 +153,8 @@
         'date': fields.datetime('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September')]),
+            ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
+            ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly = True),
         'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
@@ -173,6 +174,8 @@
 CREATE OR REPLACE view report_stock_inventory AS (
     (SELECT
         min(m.id) as id, m.date as date,
+        to_char(m.date, 'YYYY') as year,
+        to_char(m.date, 'MM') as month,
         m.address_id as partner_id, m.location_id as location_id,
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
@@ -196,6 +199,8 @@
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
+        to_char(m.date, 'YYYY') as year,
+        to_char(m.date, 'MM') as month,
         m.address_id as partner_id, m.location_dest_id as location_id,
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,