odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Better therminology 

bzr revid: fp@tinyerp.com-cd180ddb8958072040e9919bcfe7b23c80735c4b
This commit is contained in:
Fabien Pinckaers 2007-08-08 19:55:39 +00:00
parent b691ff4e07
commit 3af852682d
17 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account_view.xml
View File

@ -866,7 +866,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_move_tree"/>
</record>
<menuitem name="Financial Management/Entries/Entry lookup/" id="menu_action_move_line_form" action="action_move_line_form"/>
<menuitem name="Financial Management/Entries/Search entries/" id="menu_action_move_line_form" action="action_move_line_form"/>
<record model="ir.actions.act_window" id="action_move_line_search">
<field name="name">Entry line</field>
@ -888,7 +888,7 @@
<field name="act_window_id" ref="action_move_line_search"/>
</record>
<menuitem name="Financial Management/Entries/Entry lookup/" id="menu_action_move_line_search" action="action_move_line_search"/>
<menuitem name="Financial Management/Entries/Search entries/" id="menu_action_move_line_search" action="action_move_line_search"/>
<menuitem name="Financial Management/Charts" sequence="7"/>
<wizard string="Accounts Charts" menu="False" model="account.account" name="account.chart" id="wizard_account_chart"/>

4
addons/account/project/project.py
View File

@ -134,9 +134,9 @@ class account_analytic_account(osv.osv):
'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Account Name'),
'code' : fields.char('Account code', size=24),
'active' : fields.boolean('Active'),
'type': fields.selection([('view','View'), ('normal','Normal')], 'type'),
'type': fields.selection([('view','View'), ('normal','Normal')], 'Account type'),
'description' : fields.text('Description'),
'parent_id': fields.many2one('account.analytic.account', 'Parent Cost account', select=2),
'parent_id': fields.many2one('account.analytic.account', 'Parent analytic account', select=2),
'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Childs Accounts'),
'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic entries'),
'balance' : fields.function(_balance_calc, method=True, type='float', string='Balance'),

2
addons/account_payment/payment.py
View File

@ -96,7 +96,7 @@ class payment_order(osv.osv):
return [(r['code'],r['name']) for r in res] + [('manual', 'Manual')]
_columns = {
'date_planned': fields.date('Date if fixed'),
'date_planned': fields.date('Scheduled date if fixed'),
'reference': fields.char('Reference',size=128),
'mode': fields.selection(mode_get, 'Payment mode',size=16,required=True, select=True),
'state': fields.selection([('draft', 'Draft'),('open','Open'),

2
addons/board_sale/board_sale_view.xml
View File

@ -14,7 +14,7 @@
<hpaned position="100">
<child1>
<action
string="Your open quotations"
string="My open quotations"
name="%(sale.action_order_tree10)d"
colspan="4"
height="200"

2
addons/esale_ez/esale.py
View File

@ -241,7 +241,7 @@ class esale_order_line(osv.osv):
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)], change_default=True),
'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
'price_unit': fields.float('Unit Price', required=True),
'date_planned': fields.date('Date Promised', required=True),
'date_planned': fields.date('Scheduled date', required=True),
}
_defaults = {
'date_planned': lambda *a: time.strftime('%Y-%m-%d'),

8
addons/hr/hr_view.xml
View File

@ -149,7 +149,7 @@
<field name="model">hr.timesheet.group</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Timesheet group">
<form string="Timesheet category">
<field name="name" select="1"/>
<field name="manager" select="1"/>
<newline />
@ -164,7 +164,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="create_group" />
</record>
<menuitem name="Human Resources/Configuration/Timesheet Groups" id="menu_edit_workgroup" action="edit_workgroup" groups="admin"/>
<menuitem name="Human Resources/Configuration/Timesheet categories" id="menu_edit_workgroup" action="edit_workgroup" groups="admin"/>
<record model="ir.ui.view" id="view_timesheet_tree">
<field name="name">hr.timesheet.tree</field>
@ -263,13 +263,13 @@
<menuitem name="Human Resources/Configuration/Categories of Employee" id="menu_view_employee_category_form" action="open_view_categ_form" groups="admin"/>
<record model="ir.actions.act_window" id="open_view_categ_tree">
<field name="name">Categories Tree</field>
<field name="name">Categories structure</field>
<field name="res_model">hr.employee.category</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_employee_category_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<menuitem name="Human Resources/Configuration/Categories of Employee/Categories Tree" id="menu_view_employee_category_tree" action="open_view_categ_tree" groups="admin"/>
<menuitem name="Human Resources/Configuration/Categories of Employee/Categories structure" id="menu_view_employee_category_tree" action="open_view_categ_tree" groups="admin"/>
<record model="ir.ui.view" id="view_attendance_who">
<field name="name">hr.attendance.tree</field>

4
addons/hr_skill/hr_skill_view.xml
View File

@ -45,14 +45,14 @@
</record>
<!-- associe la vue en arbre des skills au bouton correspondant ds le menu principal -->
<record model="ir.actions.act_window" id="open_view_skill_tree">
<field name="name">Skills Tree</field>
<field name="name">Skills structure</field>
<field name="res_model">hr_skill.skill</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_hr_skill_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<!-- ajoute une entree "skill tree" dans le menu principal -->
<menuitem name="Human Resources/Configuration/Skills Management/Skills Tree" id="menu_open_view_skill_tree" action="open_view_skill_tree"/>
<menuitem name="Human Resources/Configuration/Skills Management/Skills structure" id="menu_open_view_skill_tree" action="open_view_skill_tree"/>

2
addons/hr_skill/old-hr_skill_view.xml
View File

@ -49,7 +49,7 @@
<field name="domain">[('parent_id','=',False)]</field>
</record>
<!-- ajoute une entree "skill tree" dans le menu principal -->
<menuitem name="Human Resources/Configuration/Skills Tree" id="menu_open_view_skill_tree" action="open_view_skill_tree"/>
<menuitem name="Human Resources/Configuration/Skills structure" id="menu_open_view_skill_tree" action="open_view_skill_tree"/>

8
addons/mrp/mrp.py
View File

@ -319,7 +319,7 @@ class mrp_production(osv.osv):
'location_src_id': fields.many2one('stock.location', 'Production Location', required=True),
'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True),
'date_planned': fields.date('Planned date', required=True),
'date_planned': fields.date('Scheduled date', required=True),
'date_start': fields.datetime('Start Date'),
'date_finnished': fields.datetime('End Date'),
@ -330,7 +330,7 @@ class mrp_production(osv.osv):
'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products Consummed'),
'move_created_ids': fields.one2many('stock.move', 'production_id', 'Moves Created'),
'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Material Planned'),
'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'State', readonly=True)
@ -604,7 +604,7 @@ mrp_production_workcenter_line()
class mrp_production_product_line(osv.osv):
_name = 'mrp.production.product.line'
_description = 'Production planned products'
_description = 'Production scheduled products'
_columns = {
'name': fields.char('Name', size=64, required=True),
'product_id': fields.many2one('product.product', 'Product', required=True),
@ -628,7 +628,7 @@ class mrp_procurement(osv.osv):
'name': fields.char('Name', size=64, required=True),
'origin': fields.char('Origin', size=64),
'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
'date_planned': fields.date('Date Promised', required=True),
'date_planned': fields.date('Scheduled date', required=True),
'date_close': fields.date('Date Closed'),
'product_id': fields.many2one('product.product', 'Product', required=True),
'product_qty': fields.float('Quantity', required=True),

4
addons/mrp/mrp_report.xml
View File

@ -7,8 +7,8 @@
<record id="ir_report_custom_1" model="ir.report.custom">
<field name="model_id" model="ir.model" search="[('model','=','mrp.bom')]"/>
<field name="title">BOM Tree</field>
<field name="name">Bom Tree</field>
<field name="title">BoM structure</field>
<field name="name">BoM structure</field>
<field name="field_parent" model="ir.model.fields" search="[('name','=','bom_lines')]"/>
</record>

22
addons/mrp/mrp_view.xml
View File

@ -13,7 +13,7 @@
<field name="model">mrp.property.group</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Property Groups">
<form string="Properties categories">
<separator string="General Information" colspan="4"/>
<field name="name" select="1" colspan="4"/>
<field name="description" colspan="4"/>
@ -27,7 +27,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Production Management/Configuration" groups="admin"/>
<menuitem name="Production Management/Configuration/Properties/Property groups" id="menu_mrp_property_group_action" action="mrp_property_group_action"/>
<menuitem name="Production Management/Configuration/Properties/Property categories" id="menu_mrp_property_group_action" action="mrp_property_group_action"/>
<record model="ir.ui.view" id="mrp_property_tree_view">
<field name="name">mrp.property.tree</field>
@ -106,7 +106,7 @@
<field name="time_stop"/>
</group>
</page>
<page string="Cost Accounting">
<page string="Analytic Accounting">
<field name="costs_hour"/>
<field name="costs_hour_account_id"/>
<field name="costs_cycle"/>
@ -383,7 +383,7 @@
<button name="button_cancel" string="Cancel" states="draft,ready,confirmed,in_production,picking_except"/>
<button name="button_recreate" string="Recreate Picking" states="picking_except"/>
</group>
</page><page string="Planned Materials">
</page><page string="Scheduled goods">
<field name="product_lines" colspan="4" nolabel="1" widget="one2many_list"/>
</page><page string="Workcenters">
<field name="workcenter_lines" colspan="4" nolabel="1" widget="one2many_list"/>
@ -500,7 +500,7 @@
<field name="model">mrp.production.product.line</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Planned Products">
<form string="Scheduled goods">
<field name="name"/>
<field name="product_id"/>
<field name="product_uom"/>
@ -513,7 +513,7 @@
<field name="model">mrp.production.product.line</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Planned Products">
<tree string="Scheduled goods">
<field name="product_id"/>
<field name="product_uom"/>
<field name="product_qty"/>
@ -631,7 +631,7 @@
<field name="model">stock.warehouse.orderpoint</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Orderpoint rules">
<tree string="Stock minimum rules">
<field name="warehouse_id"/>
<field name="product_id"/>
<field name="product_uom"/>
@ -648,7 +648,7 @@
<field name="model">stock.warehouse.orderpoint</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Orderpoint rule">
<form string="Stock minimum rules">
<field name="name" select="1"/>
<field name="active" select="1"/>
<field name="warehouse_id" select="1"/>
@ -671,16 +671,16 @@
<field name="view_id" ref="view_warehouse_orderpoint_tree"/>
</record>
<menuitem name="Inventory Control/Reordering policy" sequence="4"/>
<menuitem name="Inventory Control/Reordering policy/Minimum quantity rules" id="menu_action_orderpoint_form" action="action_orderpoint_form"/>
<menuitem name="Inventory Control/Reordering policy/Stock minimum rules" id="menu_action_orderpoint_form" action="action_orderpoint_form"/>
<act_window name="Orderpoints"
<act_window name="Stock minimum rules"
domain="[('warehouse_id', '=', active_id)]"
res_model="stock.warehouse.orderpoint"
src_model="stock.warehouse"
id="act_stock_warehouse_2_stock_warehouse_orderpoint"/>
<!-- add product_uom to context to be the default value when adding new orderpoints -->
<act_window name="Orderpoints"
<act_window name="Stock minimum rules"
domain="[('product_id', '=', active_id)]"
context="{'product_uom': uom_id}"
res_model="stock.warehouse.orderpoint"

2
addons/mrp/mrp_wizard.xml
View File

@ -18,7 +18,7 @@
<menuitem name="Production Management/Start all schedulers/Start procurement scheduling" action="wiz_mrp_proc1" type="wizard" id="menu_wiz_mrp_proc1"/>
<record model="ir.actions.wizard" id="wiz_mrp_proc2">
<field name="name">Compute Orderpoint</field>
<field name="name">Compute stock minimum rules</field>
<field name="wiz_name">mrp.procurement.orderpoint.compute</field>
</record>
<menuitem name="Production Management/Start all schedulers/Start order point scheduling" action="wiz_mrp_proc2" type="wizard" id="menu_wiz_mrp_proc2"/>

2
addons/project/project.py
View File

@ -101,7 +101,7 @@ class project(osv.osv):
'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
'parent_id': fields.many2one('project.project', 'Parent project'),
'child_id': fields.one2many('project.project', 'parent_id', 'Subproject'),
'planned_hours': fields.function(_calc_planned, method=True, string='Hours planned'),
'planned_hours': fields.function(_calc_planned, method=True, string='Planned hours'),
'effective_hours': fields.function(_calc_effective, method=True, string='Hours spent'),
'date_start': fields.date('Project started on'),
'date_end': fields.date('Project should end on'),

2
addons/purchase/purchase.py
View File

@ -300,7 +300,7 @@ class purchase_order_line(osv.osv):
_columns = {
'name': fields.char('Description', size=64, required=True),
'product_qty': fields.float('Quantity', required=True, digits=(16,2)),
'date_planned': fields.date('Date Promised', required=True),
'date_planned': fields.date('Scheduled date', required=True),
'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True),

2
addons/report_analytic_planning/report_analytic_planning.py
View File

@ -139,7 +139,7 @@ class report_account_analytic_planning_stat(osv.osv):
'user_id': fields.many2one('res.users', 'User'),
'manager_id': fields.many2one('res.users', 'Manager'),
'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
'sum_amount': fields.float('Planned Work', required=True),
'sum_amount': fields.float('Planned hours', required=True),
'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
}

10
addons/stock/stock.py
View File

@ -231,8 +231,8 @@ class stock_move_lot(osv.osv):
'active': fields.boolean('Active'),
'state': fields.selection( (('draft','Draft'),('done','Moved')), 'State', readonly=True),
'serial': fields.char('Tracking Number', size=32),
'date_planned': fields.date('Planned Date'),
'date_moved': fields.date('Actual Date'),
'date_planned': fields.date('Scheduled date'),
'date_moved': fields.date('Actual date'),
'lot_id': fields.many2one('stock.lot','Lot', required=True),
'loc_dest_id': fields.many2one('stock.location', 'Destination Location', required=True),
'address_id': fields.many2one('res.partner.address', 'Destination Address'),
@ -644,15 +644,15 @@ class stock_move(osv.osv):
'priority': fields.selection([('0','Not urgent'),('1','Urgent')], 'Priority'),
'date': fields.datetime('Date Created'),
'date_planned': fields.date('Planned date', required=True),
'date_planned': fields.date('Scheduled date', required=True),
'product_id': fields.many2one('product.product', 'Product', required=True),
'product_qty': fields.float('Quantity (UOM)', required=True),
'product_qty': fields.float('Quantity', required=True),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
'product_uos_qty': fields.float('Quantity (UOS)'),
'product_uos': fields.many2one('product.uom', 'Product UOS'),
'product_packaging' : fields.many2one('product.packaging', 'Product packaging'),
'product_packaging' : fields.many2one('product.packaging', 'Packaging'),
'location_id': fields.many2one('stock.location', 'Source Location', required=True),
'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True),

2
addons/stock/stock_view.xml
View File

@ -128,7 +128,7 @@
<field name="view_id" ref="view_tracking_tree"/>
</record>
<menuitem name="Inventory Control/Traceability" sequence="2"/>
<menuitem name="Inventory Control/Traceability/Tracking serial " id="menu_action_tracking_form" action="action_tracking_form"/>
<menuitem name="Inventory Control/Traceability/Tracking lots " id="menu_action_tracking_form" action="action_tracking_form"/>
<record model="ir.ui.view" id="lot_line_tree">
<field name="name">stock.tracking.tree</field>