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

Better therminology 

bzr revid: fp@tinyerp.com-61e744aeca52637bc2c8ab6d050e58672f1afbe4
This commit is contained in:
Fabien Pinckaers 2007-08-08 20:17:24 +00:00
parent 3af852682d
commit 9a0c8564d9
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/account_view.xml
View File

@ -643,7 +643,7 @@
name="account.move.journal"
menu="False"
id="action_move_journal_line_form" />
<menuitem name="Financial Management/Entries/Entries in a journal" id="menu_action_move_journal_line_form" action="action_move_journal_line_form" type="wizard"/>
<menuitem name="Financial Management/Entries/Entries by journal" id="menu_action_move_journal_line_form" action="action_move_journal_line_form" type="wizard"/>
<record model="ir.actions.act_window" id="action_move_journal_period_line_form">
<field name="name">Open journals</field>
@ -651,7 +651,7 @@
<field name="view_type">tree</field>
<field name="domain">[('state','&lt;&gt;','done')]</field>
</record>
<menuitem name="Financial Management/Entries/Entries in a journal/" id="menu_action_move_journal_period_line_form" action="action_move_journal_period_line_form"/>
<menuitem name="Financial Management/Entries/Entries by journal/" id="menu_action_move_journal_period_line_form" action="action_move_journal_period_line_form"/>
<!--
Entries lines
@ -1150,7 +1150,7 @@
<field name="journal_id" select="1"/>
<field name="lines_id" colspan="4" widget="one2many_list"/>
<group col="1" colspan="4">
<button name="generate" string="Generate Entries" type="object"/>
<button name="generate" string="Create entries" type="object"/>
</group>
</form>
</field>

4
addons/account/account_wizard.xml
View File

@ -100,13 +100,13 @@
<!-- subscriptions -->
<wizard
string="Generate subscription entries"
string="Create subscription entries"
model="account.subscription"
name="account.subscription.generate"
menu="False"
id="wizard_generate_subscription"/>
<menuitem
name="Financial Management/Periodical processing/Subscription entries"
name="Financial Management/Periodical processing/Create subscription entries"
action="wizard_generate_subscription"
type="wizard"
id="menu_generate_subscription"/>

4
addons/esale_osc/esale_osc_view.xml
View File

@ -177,9 +177,9 @@
<field colspan="4" name="note" nolabel="1"/>
</page>
<page string="History">
<separator colspan="4" string="Generated Invoices"/>
<separator colspan="4" string="Related invoices"/>
<field colspan="4" name="invoice_ids" nolabel="1"/>
<separator colspan="4" string="Generated Packings"/>
<separator colspan="4" string="Related packings"/>
<field colspan="4" name="picking_ids" nolabel="1"/>
</page>
</notebook>

4
addons/mrp/mrp.py
View File

@ -325,8 +325,8 @@ class mrp_production(osv.osv):
'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
'picking_id': fields.many2one('stock.picking', 'Packing list'),
'move_prod_id': fields.many2one('stock.move', 'Move Product'),
'picking_id': fields.many2one('stock.picking', 'Packing list', readonly=True),
'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
'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'),

2
addons/mrp/mrp_view.xml
View File

@ -281,7 +281,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="mrp_bom_tree_view"/>
</record>
<menuitem name="Production Management/Configuration/Bill of Materials/BoMs Components" id="menu_mrp_bom_form_action2" action="mrp_bom_form_action2"/>
<menuitem name="Production Management/Configuration/Bill of Materials/BoMs lines" id="menu_mrp_bom_form_action2" action="mrp_bom_form_action2"/>
<record model="ir.actions.act_window" id="action2">

2
addons/purchase_discount/report/order.rml
View File

@ -160,7 +160,7 @@
<para style="P13">Applicable Taxes</para>
</td>
<td>
<para style="P13">Date Promised</para>
<para style="P13">Scheduled date</para>
</td>
<td>
<para style="P13">Qty</para>

8
addons/sale/sale_view.xml
View File

@ -169,9 +169,9 @@
<field name="note" colspan="4" nolabel="1"/>
</page>
<page string="History">
<separator string="Generated Invoices" colspan="4"/>
<separator string="Related invoices" colspan="4"/>
<field name="invoice_ids" colspan="4" nolabel="1"/>
<separator string="Generated packings" colspan="4"/>
<separator string="Related packings" colspan="4"/>
<field name="picking_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
@ -411,14 +411,14 @@
<menuitem name="Sales Management/Sales order lines/Uninvoiced lines" id="menu_action_order_line_tree2" action="action_order_line_tree2"/>
<record model="ir.actions.act_window" id="action_order_line_tree3">
<field name="name">Uninvoiced lines done</field>
<field name="name">Uninvoiced lines delivered</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
</record>
<menuitem name="Sales Management/Sales order lines/Uninvoiced lines/Uninvoiced lines done" id="menu_action_order_line_tree3" action="action_order_line_tree3"/>
<menuitem name="Sales Management/Sales order lines/Uninvoiced lines/Uninvoiced lines delivered" id="menu_action_order_line_tree3" action="action_order_line_tree3"/>
<act_window name="Sales"
domain="[('partner_id', '=', active_id)]"

2
addons/sale_category/report/sale_category_report.rml
View File

@ -147,7 +147,7 @@
<para style="P15">Applicable Taxes</para>
</td>
<td>
<para style="P14">Date Promised</para>
<para style="P14">Scheduled Date</para>
</td>
<td>
<para style="P14">Qty</para>

2
addons/scrum/scrum_wizard.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<terp>
<data>
<wizard id="wizard_scrum_backlog_task" string="Generate tasks" model="scrum.product.backlog" name="scrum.product.backlog.task.create"/>
<wizard id="wizard_scrum_backlog_task" string="Created tasks" model="scrum.product.backlog" name="scrum.product.backlog.task.create"/>
</data>
</terp>

8
addons/stock/stock.py
View File

@ -337,14 +337,14 @@ class stock_picking(osv.osv):
], 'State', readonly=True),
'date':fields.datetime('Date create'),
'move_lines': fields.one2many('stock.move', 'picking_id', 'Move Lines'),
'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines'),
'auto_picking': fields.boolean('Auto-Packing'),
'work': fields.boolean('Work todo'),
'loc_move_id': fields.many2one('stock.location', 'Move to Location'),
'loc_move_id': fields.many2one('stock.location', 'Final location'),
'address_id': fields.many2one('res.partner.address', 'Partner'),
'lot_id': fields.many2one('stock.lot', 'Consumer Lot Created'),
'move_lot_id': fields.many2one('stock.move.lot', 'Moves Created'),
'lot_id': fields.many2one('stock.lot', 'Consumer lot created'),
'move_lot_id': fields.many2one('stock.move.lot', 'Moves created'),
'invoice_state':fields.selection([
("invoiced","Invoiced"),
("2binvoiced","To be invoiced"),

2
addons/stock/stock_view.xml
View File

@ -527,7 +527,7 @@
</group>
</page><page string="Notes">
<field name="note" nolabel="1" colspan="4"/>
</page><page string="Others Infos">
</page><page string="Others info">
<field name="origin" select="2"/>
<field name="active" select="2"/>
<field name="auto_picking"/>