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

[Bharat Devnani (Open ERP)]

Hello Sir,

I have changed the table name of field user_id in point_of_sale/wizard/pos_payment_report_user.py.

Thanks & Regards,
Devnani Bharat R.

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

Hello,

Please change the label of the wizard as it is confusing Its "Sales by Products" but we select users in the wizard.

and the table name "res_user_sale_user" in your patch is also not good.

Thanks,
Purnendu Singh

review: Needs Fixing

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

Hello Sir,

I have changed the table name and given appropriate menu name for report.

Thanks & Regards,
Devnani Bharat R.

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

review: Approve

=== modified file 'point_of_sale/wizard/pos_payment_report_date.py'
--- point_of_sale/wizard/pos_payment_report_date.py	2011-01-14 00:11:01 +0000
+++ point_of_sale/wizard/pos_payment_report_date.py	2011-10-20 10:09:25 +0000
@@ -55,7 +55,7 @@
     _columns = {
         'date_start': fields.date('Start Date', required=True),
         'date_end': fields.date('End Date', required=True),
-        'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
+        'user_id': fields.many2many('res.users', 'res_user_sale_date', 'user_id', 'sale_id', 'Salesman')
     }
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-%m-%d'),

=== modified file 'point_of_sale/wizard/pos_payment_report_date_view.xml'
--- point_of_sale/wizard/pos_payment_report_date_view.xml	2011-10-02 17:31:16 +0000
+++ point_of_sale/wizard/pos_payment_report_date_view.xml	2011-10-20 10:09:25 +0000
@@ -21,13 +21,13 @@
                         <button name="print_report" string="Print Report"
                                 colspan="1" type="object" icon="gtk-print" />
                     </group>
-                 </group>            
+                 </group>
             </form>
             </field>
         </record>
 
         <record id="action_report_pos_payment_repport_date" model="ir.actions.act_window">
-            <field name="name">Sales by Products</field>
+            <field name="name">Sales by Users</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.payment.report.date</field>
             <field name="view_type">form</field>
@@ -35,4 +35,4 @@
             <field name="target">new</field>
         </record>
         </data>
-</openerp>              
+</openerp>