pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Production : graph view added, removed unused dependacany of report_crm. added access rules

Browse Source 
bzr revid: vir@tinyerp.com-20100316104618-xi7wdoldnnc133ka
This commit is contained in:
Vir (Open ERP)
2010-03-16 16:16:18 +05:30
parent 7083ee61a3
commit 9d9692ec59
9 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/board_manufacturing/__terp__.py
+1 -1
View File
@@ -32,7 +32,7 @@
* List of procurement in exception
""",
'author': 'Tiny',
'depends': ['board', 'mrp', 'stock', 'report_mrp'],
'depends': ['board', 'mrp', 'stock' ],
'update_xml': ['board_manufacturing_view.xml'],
'demo_xml': ['board_manufacturing_demo.xml'],
'installable': True,
addons/board_manufacturing/board_manufacturing_view.xml
+2 -2
View File
@@ -20,9 +20,9 @@
<child2>
<action colspan="4" name="%(report_mrp.action_report_workcenter_load_tree)d" string="Work Center future load"/>
<action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center future load"/>
<action colspan="4" name="%(report_mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/>
<action colspan="4" name="%(mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/>
</child2>
</hpaned>
</form>
addons/mrp/report/mrp_production_order.py
+2
View File
@@ -32,6 +32,7 @@ class mrp_production_order(osv.osv):
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'reference': fields.char('Reference', size=64, required=True),
'origin': fields.char('Source Document', size=64),
'nbr': fields.integer('# of Orders', readonly=True),
'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','<>','service')]),
'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True),
'scheduled_date':fields.date('Scheduled Date'),
@@ -50,6 +51,7 @@ class mrp_production_order(osv.osv):
to_char(c.create_date, 'MM') as month,
c.state,
c.product_id,
count(*) as nbr,
to_date(to_char(c.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as scheduled_date,
c.name as reference,
c.origin,
addons/mrp/report/mrp_production_order_view.xml
+19 -19
View File
@@ -17,6 +17,7 @@
<field name="scheduled_date"/>
<field name="reference" />
<field name="origin"/>
<field name="nbr" string="#Production Orders" />
<field name="location_src_id"/>
<field name="location_dest_id" />
<field name="state" invisible="1"/>
@@ -39,18 +40,17 @@
</field>
</record>
<!-- <record id="view_report_mrp_production_order_graph" model="ir.ui.view">-->
<!-- <field name="name">mrp.production.order.graph</field>-->
<!-- <field name="model">mrp.production.order</field>-->
<!-- <field name="type">graph</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <graph orientation="horizontal" string="Helpdesk" type="bar">-->
<!-- <field name="state"/>-->
<!-- <field name="nbr" operator="+"/>-->
<!-- <field group="True" name="user_id"/>-->
<!-- </graph>-->
<!-- </field>-->
<!-- </record>-->
<record id="view_report_mrp_production_order_graph" model="ir.ui.view">
<field name="name">mrp.production.order.graph</field>
<field name="model">mrp.production.order</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph orientation="horizontal" string="Production" type="bar">
<field name="state"/>
<field name="nbr" operator="+"/>
</graph>
</field>
</record>
<record id="view_report_mrp_production_order_filter" model="ir.ui.view">
<field name="name">mrp.production.order.select</field>
@@ -89,7 +89,7 @@
<field name="name">Production Order</field>
<field name="res_model">mrp.production.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_mode">tree,graph</field>
<field name="view_id" ref="view_report_mrp_production_order_tree"/>
<field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
</record>
@@ -101,12 +101,12 @@
<field name="act_window_id" ref="action_report_mrp_production_order"/>
</record>
<!-- <record model="ir.actions.act_window.view" id="action_report_mrp_production_order_graph">-->
<!-- <field name="sequence" eval="2"/>-->
<!-- <field name="view_mode">graph</field>-->
<!-- <field name="view_id" ref="view_report_mrp_production_order_graph"/>-->
<!-- <field name="act_window_id" ref="action_report_mrp_production_order"/>-->
<!-- </record>-->
<record model="ir.actions.act_window.view" id="action_report_mrp_production_order_graph">
<field name="sequence" eval="2"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="view_report_mrp_production_order_graph"/>
<field name="act_window_id" ref="action_report_mrp_production_order"/>
</record>
<menuitem name="Production" action="action_report_mrp_production_order" id="menu_report_mrp_production_orders_tree" parent="next_id_77"/>
addons/mrp/security/ir.model.access.csv
+3 -1
View File
@@ -32,4 +32,6 @@
"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
"access_mrp_installer","mrp.installer","model_mrp_installer","mrp.group_mrp_user",1,0,0,0
"access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,0,0,0
"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",,,,
"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0
"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
32 access_mrp_production_stock_worker mrp.production stock_worker model_mrp_production stock.group_stock_user 1 0 0 0
33 access_mrp_installer mrp.installer model_mrp_installer mrp.group_mrp_user 1 0 0 0
34 access_mrp_product_produce mrp.product.produce model_mrp_product_produce mrp.group_mrp_user 1 0 0 0
35 access_mrp_production_order mrp.production.order model_mrp_production_order mrp.group_mrp_user 1 0 0 0
36 access_report_workcenter_load report.workcenter.load model_report_workcenter_load mrp.group_mrp_manager 1 0 0 0
37 access_report_mrp_inout report.mrp.inout model_report_mrp_inout mrp.group_mrp_manager 1 0 0 0
addons/point_of_sale/__terp__.py
+1 -1
View File
@@ -36,7 +36,7 @@ Main features :
""",
'author': 'Tiny',
'depends': ['sale', 'delivery','report_mrp'],
'depends': ['sale', 'delivery'],
# 'depends': ['sale', 'purchase', 'account', 'account_tax_include','board','mrp','board_manufacturing','delivery','profile_manufacturing','account','multi_company'],
'init_xml': [
'security/point_of_sale_security.xml',
addons/point_of_sale/statement_data.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<field eval="1" name="global"/>
</record>
<record id="point_of_sale.res_groups_posuser0" model="res.groups">
<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp.menu_mrp_procurement_action3'),ref('mrp.menu_mrp_procurement_new'),ref('report_mrp.next_id_77'),ref('report_mrp.menu_report_workcenter_load'),ref('report_mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp.menu_mrp_procurement_action3'),ref('mrp.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
<field eval="[(6,0,[ref('ir_rule_group_bankstatementcompany0'),ref('ir_rule_group_bankstatementlinecompany0'),ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
</record>
addons/report_mrp/__terp__.py
+3 -3
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -30,7 +30,7 @@
'website': 'http://www.openerp.com',
'depends': ['mrp'],
'init_xml': [],
'update_xml': ['security/ir.model.access.csv', 'report_mrp_view.xml'],
'update_xml': ['security/ir.model.access.csv', ],
'demo_xml': [],
'installable': True,
'certificate': '0071582896029',
addons/report_mrp/security/ir.model.access.csv
+1 -3
View File
@@ -1,3 +1 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_report_workcenter_load,report.workcenter.load,model_report_workcenter_load,mrp.group_mrp_manager,1,0,0,0
access_report_mrp_inout,report.mrp.inout,model_report_mrp_inout,mrp.group_mrp_manager,1,0,0,0
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
access_report_workcenter_load report.workcenter.load model_report_workcenter_load mrp.group_mrp_manager 1 0 0 0
access_report_mrp_inout report.mrp.inout model_report_mrp_inout mrp.group_mrp_manager 1 0 0 0