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

modifs

Browse Source 
bzr revid: fp@tinyerp.com-20081122160626-ndmu1x3sq7cxgat7
This commit is contained in:
Fabien Pinckaers
2008-11-22 17:06:26 +01:00
parent 188f781333 67ca84598f
commit f952cbfc05
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/report/order.rml
+2 -2
View File
@@ -149,7 +149,7 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_Bold_9">Invoice address :[[ o.partner_id.property_payment_term.name ]]</para>
<para style="terp_default_Bold_9">Invoice address :</para>
<para style="terp_default_9">[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
<para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]][[ o.partner_invoice_id.city or '' ]][[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
</td>
@@ -213,7 +213,7 @@
<para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ o.partner_id and o.partner_id.property_payment_term and o.partner_id.property_payment_term['name'] or '' ]]</para>
<para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
</td>
</tr>
</blockTable>
addons/stock/stock_view.xml
+8 -8
View File
@@ -271,26 +271,26 @@
<wizard
id="action_lot2"
model="stock.production.lot"
name="stock.traceability.lot.amont"
string="Downstream traceability"/>
name="stock.traceability.lot.upstream"
string="Upstream traceability"/>
<wizard
id="action_lot4"
model="stock.production.lot"
name="stock.traceability.lot.aval"
string="Upstream traceability"/>
name="stock.traceability.lot.downstream"
string="Downstream traceability"/>
<wizard
id="action4"
model="stock.tracking"
name="stock.traceability.amont"
string="Downstream traceability"/>
name="stock.traceability.upstream"
string="Upstream traceability"/>
<wizard
id="action2"
model="stock.tracking"
name="stock.traceability.aval"
string="Upstream traceability"/>
name="stock.traceability.downstream"
string="Downstream traceability"/>
<record id="action3" model="ir.actions.act_window">
<field name="name">Downstream traceability</field>
addons/stock/wizard/stock_traceability.py
+4 -4
View File
@@ -52,7 +52,7 @@ class wiz_journal(wizard.interface):
'result': {'type': 'action', 'action': action_traceability(), 'state':'end'}
}
}
wiz_journal('stock.traceability.aval')
wiz_journal('stock.traceability.downstream')
class wiz_journal2(wizard.interface):
states = {
@@ -61,7 +61,7 @@ class wiz_journal2(wizard.interface):
'result': {'type': 'action', 'action': action_traceability('move_history_ids2'), 'state':'end'}
}
}
wiz_journal2('stock.traceability.amont')
wiz_journal2('stock.traceability.upstream')
class wiz_journal3(wizard.interface):
states = {
@@ -70,7 +70,7 @@ class wiz_journal3(wizard.interface):
'result': {'type': 'action', 'action': action_traceability(field='prodlot_id'), 'state':'end'}
}
}
wiz_journal3('stock.traceability.lot.amont')
wiz_journal3('stock.traceability.lot.upstream')
class wiz_journal4(wizard.interface):
states = {
@@ -79,7 +79,7 @@ class wiz_journal4(wizard.interface):
'result': {'type': 'action', 'action': action_traceability('move_history_ids2', 'prodlot_id'), 'state':'end'}
}
}
wiz_journal4('stock.traceability.lot.aval')
wiz_journal4('stock.traceability.lot.downstream')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: