Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-fix-all-graph-views-apa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fix-all-graph-views-apa/+merge/130082
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fix-all-graph-views-apa/+merge/130082
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-fix-all-graph-views-apa.
=== modified file 'account/report/account_invoice_report_view.xml'
--- account/report/account_invoice_report_view.xml 2012-10-15 11:25:30 +0000
+++ account/report/account_invoice_report_view.xml 2012-10-29 05:19:23 +0000
@@ -42,7 +42,7 @@
<field name="arch" type="xml">
<graph string="Invoices Analysis" type="bar">
<field name="product_id"/>
- <field name="user_currency_price_total"/>
+ <field name="price_total"/>
</graph>
</field>
</record>
=== modified file 'account_bank_statement_extensions/account_bank_statement_view.xml'
--- account_bank_statement_extensions/account_bank_statement_view.xml 2012-10-12 13:06:39 +0000
+++ account_bank_statement_extensions/account_bank_statement_view.xml 2012-10-29 05:19:23 +0000
@@ -148,7 +148,7 @@
<field name="name">Bank Statement Lines</field>
<field name="res_model">account.bank.statement.line</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,graph,form</field>
+ <field name="view_mode">tree,form</field>
<field name="context">{'block_statement_line_delete' : 1}</field>
<field name="search_view_id" ref="view_bank_statement_line_filter"/>
<field name="view_id" ref="view_bank_statement_line_list"/>
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2012-10-08 06:59:09 +0000
+++ account_budget/account_budget_view.xml 2012-10-29 05:19:23 +0000
@@ -290,7 +290,7 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Budget Lines" groups="account.group_account_user">
- <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
+ <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree">
<tree string="Budget Lines" editable="top">
<field name="crossovered_budget_id"/>
<field name="general_budget_id"/>
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2012-10-24 20:29:48 +0000
+++ event/event_view.xml 2012-10-29 05:19:23 +0000
@@ -313,20 +313,6 @@
</field>
</record>
- <!-- Event Graph view -->
-
- <record model="ir.ui.view" id="view_event_graph">
- <field name="name">Event Graph</field>
- <field name="model">event.event</field>
- <field name="arch" type="xml">
- <graph string="Event by Registration" type="bar" orientation="horizontal">
- <field name="name"/>
- <field name="register_current" operator="+"/>
- <field name="register_prospect" operator="+"/>
- </graph>
- </field>
- </record>
-
<!-- Event Search View -->
<record model="ir.ui.view" id="view_event_search">
@@ -362,7 +348,7 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">event.event</field>
<field name="view_type">form</field>
- <field name="view_mode">kanban,calendar,tree,form,graph</field>
+ <field name="view_mode">kanban,calendar,tree,form</field>
<field name="context">{"search_default_upcoming":1}</field>
<field name="search_view_id" ref="view_event_search"/>
<field name="help" type="html">
=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report_view.xml'
--- hr_timesheet_sheet/report/hr_timesheet_report_view.xml 2012-09-27 08:38:39 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report_view.xml 2012-10-29 05:19:23 +0000
@@ -26,7 +26,6 @@
<field name="product_id" invisible="1"/>
<field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
<field name="general_account_id" invisible="1"/>
-
<field name="quantity" sum="Hours"/>
<field name="cost" sum="Total Cost"/>
</tree>
=== modified file 'hr_timesheet_sheet/report/timesheet_report.py'
--- hr_timesheet_sheet/report/timesheet_report.py 2012-10-21 19:59:25 +0000
+++ hr_timesheet_sheet/report/timesheet_report.py 2012-10-29 05:19:23 +0000
@@ -32,6 +32,7 @@
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'day': fields.char('Day', size=128, readonly=True),
+ 'date': fields.date('Date', readonly=True),
'name': fields.char('Description', size=64,readonly=True),
'product_id' : fields.many2one('product.product', 'Product'),
'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
@@ -63,6 +64,7 @@
select
min(aal.id) as id,
htss.name,
+ aal.date as date,
htss.date_from,
htss.date_to,
to_char(htss.date_from, 'YYYY-MM-DD') as day,
@@ -96,6 +98,7 @@
left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
group by
aal.account_id,
+ aal.date,
htss.date_from,
htss.date_to,
aal.unit_amount,
=== modified file 'hr_timesheet_sheet/report/timesheet_report_view.xml'
--- hr_timesheet_sheet/report/timesheet_report_view.xml 2012-10-10 20:05:11 +0000
+++ hr_timesheet_sheet/report/timesheet_report_view.xml 2012-10-29 05:19:23 +0000
@@ -17,6 +17,7 @@
<field name="model">timesheet.report</field>
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'cancel'" string="Timesheet">
+ <field name="date" invisible="1"/>
<field name="name" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="date_from" invisible="1"/>
=== modified file 'l10n_be_coda/l10n_be_coda_view.xml'
--- l10n_be_coda/l10n_be_coda_view.xml 2012-09-25 07:32:01 +0000
+++ l10n_be_coda/l10n_be_coda_view.xml 2012-10-29 05:19:23 +0000
@@ -473,7 +473,7 @@
<field name="name">CODA Statement Lines</field>
<field name="res_model">coda.bank.statement.line</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,graph,form</field>
+ <field name="view_mode">tree,form</field>
<field name="context">{'block_statement_line_delete' : 1}</field>
<field name="search_view_id" ref="view_coda_bank_statement_line_filter"/>
<field name="view_id" ref="view_coda_bank_statement_line_list"/>
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py 2012-10-16 05:25:13 +0000
+++ mrp/mrp.py 2012-10-29 05:19:23 +0000
@@ -420,28 +420,6 @@
result[prod.id]['cycle_total'] += wc.cycle
return result
- def _production_date_end(self, cr, uid, ids, prop, unknow_none, context=None):
- """ Finds production end date.
- @param prop: Name of field.
- @param unknow_none:
- @return: Dictionary of values.
- """
- result = {}
- for prod in self.browse(cr, uid, ids, context=context):
- result[prod.id] = prod.date_planned
- return result
-
- def _production_date(self, cr, uid, ids, prop, unknow_none, context=None):
- """ Finds production planned date.
- @param prop: Name of field.
- @param unknow_none:
- @return: Dictionary of values.
- """
- result = {}
- for prod in self.browse(cr, uid, ids, context=context):
- result[prod.id] = prod.date_planned[:10]
- return result
-
def _src_id_default(self, cr, uid, ids, context=None):
src_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
return src_location_id.id
@@ -469,13 +447,9 @@
'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', required=True,
readonly=True, states={'draft':[('readonly',False)]},
help="Location where the system will stock the finished products."),
-
- 'date_planned_end': fields.function(_production_date_end, type='date', string='Scheduled End Date'),
- 'date_planned_date': fields.function(_production_date, type='date', string='Scheduled Date'),
'date_planned': fields.datetime('Scheduled Date', required=True, select=1, readonly=True, states={'draft':[('readonly',False)]}),
'date_start': fields.datetime('Start Date', select=True, readonly=True),
'date_finished': fields.datetime('End Date', select=True, readonly=True),
-
'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]},
help="Bill of Materials allow you to define the list of required raw materials to make a finished product."),
'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]},
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-10-25 08:39:05 +0000
+++ mrp/mrp_view.xml 2012-10-29 05:19:23 +0000
@@ -606,7 +606,7 @@
<field name="model">mrp.production</field>
<field name="arch" type="xml">
<graph string="Manufacturing Orders" type="bar">
- <field name="date_planned_date"/>
+ <field name="date_planned"/>
<field name="hour_total" operator="+"/>
<field name="cycle_total" operator="+"/>
</graph>
=== modified file 'mrp_operations/mrp_operations.py'
--- mrp_operations/mrp_operations.py 2012-10-12 11:42:58 +0000
+++ mrp_operations/mrp_operations.py 2012-10-29 05:19:23 +0000
@@ -50,17 +50,6 @@
stock_move()
class mrp_production_workcenter_line(osv.osv):
- def _get_date_date(self, cr, uid, ids, field_name, arg, context=None):
- """ Finds starting date.
- @return: Dictionary of values.
- """
- res={}
- for op in self.browse(cr, uid, ids, context=context):
- if op.date_start:
- res[op.id] = op.date_start[:10]
- else:
- res[op.id]=False
- return res
def _get_date_end(self, cr, uid, ids, field_name, arg, context=None):
""" Finds ending date.
@@ -92,7 +81,6 @@
"* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' status.\n" \
"* When the user cancels the work order it will be set in 'Canceled' status.\n" \
"* When order is completely processed that time it is set in 'Finished' status."),
- 'date_start_date': fields.function(_get_date_date, string='Start Date', type='date'),
'date_planned': fields.datetime('Scheduled Date', select=True),
'date_planned_end': fields.function(_get_date_end, string='End Date', type='datetime'),
'date_start': fields.datetime('Start Date'),
=== modified file 'mrp_operations/mrp_operations_view.xml'
--- mrp_operations/mrp_operations_view.xml 2012-09-24 09:56:16 +0000
+++ mrp_operations/mrp_operations_view.xml 2012-10-29 05:19:23 +0000
@@ -328,7 +328,7 @@
<field name="model">mrp.production.workcenter.line</field>
<field name="arch" type="xml">
<graph string="Hours by Work Center" type="bar">
- <field name="date_start_date"/>
+ <field name="date_start"/>
<field name="hour" operator="+"/>
<field name="workcenter_id" group="True"/>
</graph>
=== modified file 'project_issue/report/project_issue_report_view.xml'
--- project_issue/report/project_issue_report_view.xml 2012-09-27 08:38:39 +0000
+++ project_issue/report/project_issue_report_view.xml 2012-10-29 05:19:23 +0000
@@ -63,7 +63,6 @@
<filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
<filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
<filter string="Task" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
- <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Version" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
