Merge lp:~openerp-dev/openobject-addons/trunk-bug-872227-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have removed uom_name field from sale/report/sale_report_view.xml and assigned value to year field in sale/report/sale_report.py

Thanks & Regards,
Devnani Bharat R.

[tfr (Openerp) (tfr)]

uom_name remain in sale.report.tree view and also in the search view.
Either it should be remove every where or
uom_name should be add in the model definition in sale_report.py

review: Needs Fixing

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello tfr,

I have kept product_uom instead of uom_name in sale/report/sale_report_view.xml, as product_uom also gives the name uom of product.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Purnendu Singh (OpenERP) (purnendu-singh)]

review: Approve

[Serpent Consulting Services (serpent-consulting-services)]

Purnendu,

Your opinion is as clear as a crystal.

I now see that the bug was already there and has been set as a duplicate where Bharat already fixed with same patch.

Henceforth, the proposal from Bharat should be given a priority undoubtedly.

Being a little strict about the technical/programmatic/philosophic/conventional manner, there is a difference in the patches.

The proposal from Bharat shows the line "to_char(s.date_order, 'YYYY') as year" after the day, which is not the right order if you see the _columns definition. It should be before month.

We prefer to respect the sequence and logical importance of the proposal and so; Bharat's proposal should go for the merge and if you consider my request of ordering of columns,the line should be taken from my proposal.

Thanks a lot for bringing this into notice,
Serpent Consulting Services.

review: Approve

[Purnendu Singh (OpenERP) (purnendu-singh)]

> Purnendu,
>
> Your opinion is as clear as a crystal.
>
> I now see that the bug was already there and has been set as a duplicate where
> Bharat already fixed with same patch.
>
> Henceforth, the proposal from Bharat should be given a priority undoubtedly.
>
> Being a little strict about the
> technical/programmatic/philosophic/conventional manner, there is a difference
> in the patches.
>
> The proposal from Bharat shows the line "to_char(s.date_order, 'YYYY') as
> year" after the day, which is not the right order if you see the _columns
> definition. It should be before month.
>
> We prefer to respect the sequence and logical importance of the proposal and
> so; Bharat's proposal should go for the merge and if you consider my request
> of ordering of columns,the line should be taken from my proposal.
>
> Thanks a lot for bringing this into notice,
> Serpent Consulting Services.

Thanks again for your contribution.

These observation are really helpful to us and as per your request i am updating the ordering of columns.

thanks and regards,
Purnendu singh

=== modified file 'sale/report/sale_report.py'
--- sale/report/sale_report.py	2011-10-16 01:28:00 +0000
+++ sale/report/sale_report.py	2011-11-11 06:25:27 +0000
@@ -76,6 +76,7 @@
                     1 as nbr,
                     s.date_order as date,
                     s.date_confirm as date_confirm,
+                    to_char(s.date_order, 'YYYY') as year,
                     to_char(s.date_order, 'MM') as month,
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
                     s.partner_id as partner_id,

=== modified file 'sale/report/sale_report_view.xml'
--- sale/report/sale_report_view.xml	2011-10-16 01:28:00 +0000
+++ sale/report/sale_report_view.xml	2011-11-11 06:25:27 +0000
@@ -22,7 +22,7 @@
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_uom_qty" sum="# of Qty"/>
                 <field name="shipped_qty_1" sum="Shipped"/>
-                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
+                <field name="product_uom" invisible="not context.get('set_visible',False)"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>
                 <field name="state" invisible="1"/>
@@ -98,7 +98,7 @@
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
-                    <filter string="Reference UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
+                    <filter string="Reference UoM" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
@@ -208,7 +208,7 @@
                 <field name="price_total" />
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
-                <field name="uom_name" invisible="1"/>
+                <field name="product_uom" invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="state" invisible="1"/>