openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01517
[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
psi (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#568537 The __compute method of account_account needs optmization to improve Accounting Performance!
https://bugs.launchpad.net/bugs/568537
#686508 Not able to validate sales receipt
https://bugs.launchpad.net/bugs/686508
#686513 Not able to validate supplier vouchers
https://bugs.launchpad.net/bugs/686513
#691218 add an employee to a department
https://bugs.launchpad.net/bugs/691218
#692139 Account Journal onchange_type method context undefined error
https://bugs.launchpad.net/bugs/692139
#692962 In hr contract, shouldn't be able to enter an end date lower than a start date
https://bugs.launchpad.net/bugs/692962
#693476 [6.0] sale manager dashboard - "Sales by Customer" - incomplete
https://bugs.launchpad.net/bugs/693476
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2/+merge/44560
hello sir,
Fix:
https://bugs.launchpad.net/openobject-addons/+bug/693476
sale manager dashboard - "Sales by Customer" - incomplete
Thanks
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2/+merge/44560
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'sale/board_sale_view.xml'
--- sale/board_sale_view.xml 2010-11-19 12:17:39 +0000
+++ sale/board_sale_view.xml 2010-12-23 10:53:56 +0000
@@ -18,7 +18,7 @@
</child1>
<child2>
<action name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman"/>
- <action name="%(sale.action_sales_by_partner)d" string="Sales by Customer"/>
+ <action name="%(sale.action_sales_by_partner)d" string="Sales by Customer in last 90 days"/>
<action name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category"/>
</child2>
</hpaned>
=== modified file 'sale/report/sale_report_view.xml'
--- sale/report/sale_report_view.xml 2010-12-22 10:09:11 +0000
+++ sale/report/sale_report_view.xml 2010-12-23 10:53:56 +0000
@@ -145,11 +145,11 @@
</record>
<record id="action_sales_by_partner" model="ir.actions.act_window">
- <field name="name">Sales by Partner</field>
+ <field name="name">Sales by Customer in last 90 days</field>
<field name="res_model">sale.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
- <field name="domain">[('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
+ <field name="domain">[('state','=','done'),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
<field name="view_id" ref="view_sales_by_partner_graph"/>
<field name="context">{'search_default_Customer':1}</field>
</record>