[IMP] feedback from PS
bzr revid: fp@tinyerp.com-20111108152142-6b0dqdnk6ntxm8ja
This commit is contained in:
Fabien Pinckaers
parent
b467d6eda2
commit
9e70e67ae5
|
|
@ -93,6 +93,7 @@ class product_uom(osv.osv):
|
|||
del(data['factor_inv'])
|
||||
return super(product_uom, self).create(cr, uid, data, context)
|
||||
|
||||
_order = "name"
|
||||
_columns = {
|
||||
'name': fields.char('Name', size=64, required=True, translate=True),
|
||||
'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
|
||||
|
|
|
|||
|
|
@ -175,7 +175,6 @@
|
|||
<field name="context">{'search_default_Current':1}</field>
|
||||
<field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
|
||||
</record>
|
||||
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_definitions" sequence="1"/>
|
||||
|
||||
<record id="open_view_template_project" model="ir.actions.act_window">
|
||||
<field name="name">Templates of Projects</field>
|
||||
|
|
@ -604,7 +603,11 @@
|
|||
</record>
|
||||
|
||||
<menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
|
||||
<menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
|
||||
|
||||
<menuitem id="menu_project_config_project" parent="menu_definitions" sequence="1"/>
|
||||
|
||||
<menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
|
||||
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1"/>
|
||||
|
||||
<act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ class project_issue(crm.crm_case, osv.osv):
|
|||
domain="[('partner_id','=',partner_id)]"),
|
||||
'company_id': fields.many2one('res.company', 'Company'),
|
||||
'description': fields.text('Description'),
|
||||
'state': fields.selection([('draft', 'New'), ('open', 'To Solve'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
|
||||
'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
|
||||
help='The state is set to \'Draft\', when a case is created.\
|
||||
\nIf the case is in progress the state is set to \'Open\'.\
|
||||
\nWhen the case is over, the state is set to \'Done\'.\
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
|
||||
<menuitem id="menu_project_confi" name="Issues" parent="project.menu_definitions" sequence="2"/>
|
||||
|
||||
<record model="ir.ui.view" id="project_issue_version_search_view">
|
||||
<field name="name">Issue Version</field>
|
||||
|
|
@ -85,8 +85,8 @@
|
|||
<group col="8" colspan="4">
|
||||
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
|
||||
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
|
||||
<button name="case_open" string="Solve" states="draft,pending" type="object" icon="gtk-go-forward"/>
|
||||
<button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
|
||||
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
|
||||
<button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
|
||||
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
|
||||
<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
|
||||
<button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
|
||||
|
|
|
|||
|
|
@ -1315,6 +1315,7 @@ class sale_config_picking_policy(osv.osv_memory):
|
|||
|
||||
if wizard.task_work:
|
||||
module_name.append('project_timesheet')
|
||||
module_name.append('project_mrp')
|
||||
module_name.append('account_analytic_analysis')
|
||||
|
||||
if wizard.timesheet:
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
groups="group_stock_manager,group_stock_user" sequence="5"
|
||||
web_icon="images/warehouse.png"
|
||||
web_icon_hover="images/warehouse-hover.png"/>
|
||||
<menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
|
||||
<menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
|
||||
<menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
|
||||
<menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
|
||||
<menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2" groups="base.group_extended"/>
|
||||
<menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
|
||||
<menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
|
||||
parent="stock.menu_stock_product" sequence="0"/>
|
||||
<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1"/>
|
||||
<menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
|
||||
<menuitem
|
||||
id="menu_product_in_config_stock" name="Product"
|
||||
id="menu_product_in_config_stock" name="Products"
|
||||
parent="stock.menu_stock_configuration" sequence="2"/>
|
||||
<menuitem
|
||||
action="product.product_category_action_form" id="menu_product_category_config_stock"
|
||||
|
|
|
|||
Loading…
Reference in New Issue