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

[MERGE]

Browse Source 
bzr revid: olt@tinyerp.com-20090617142007-bbyjikyb75gcqrfw
This commit is contained in:
Olivier Laurent
2009-06-17 16:20:07 +02:00
parent 3d88cb1d65 220631cc0e
commit f7a12ee978
4 changed files with 64 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_payment/report/order.rml
+51 -48
View File
@@ -23,7 +23,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
@@ -35,29 +35,27 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" alignment="LEFT"/>
<paraStyle name="P2" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="P3" fontName="Helvetica" alignment="RIGHT"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Table Contents" fontName="Helvetica"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Table Contents" fontName="Times-Roman"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -85,12 +83,12 @@
</para>
</td>
<td>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or '']]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or '' ]]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']]</para>
<para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']]</para>
<para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']]</para>
<para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or '']]</para>
<para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']]</para>
<para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or '' ]]</para>
<para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']]</para>
</td>
</tr>
</blockTable>
@@ -112,46 +110,51 @@
<blockTable colWidths="83.0,98.0,190.0,70.0,85.0" style="Table2">
<tr>
<td>
<para style="P1">Partner</para>
<para style="terp_tblheader_Details">Partner</para>
</td>
<td>
<para style="P1">Bank account</para>
<para style="terp_tblheader_Details">Bank account</para>
</td>
<td>
<para style="P1">Reference</para>
<para style="terp_tblheader_Details">Reference</para>
</td>
<td>
<para style="P2">Date</para>
<para style="terp_tblheader_Details_Right">Date</para>
</td>
<td>
<para style="P3">Amount</para>
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="83.0,98.0,190.0,70.0,85.0" style="Table1">
<tr>
<td>
<para style="terp_default_9">[[repeatIn(o.line_ids, 'line') ]]</para>
<para style="terp_default_9">[[ line.partner_id and line.partner_id.name or '' ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.bank_id and line.bank_id.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.date ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<section>
<para style="terp_default_9">[[repeatIn(o.line_ids, 'line') ]]</para>
<blockTable colWidths="83.0,98.0,190.0,70.0,85.0" style="Table4">
<tr>
<td>
<para style="terp_default_9">[[ line.partner_id and line.partner_id.name or '' ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.bank_id and line.bank_id.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.date ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</story>
addons/scrum/scrum_view.xml
+1 -1
View File
@@ -316,7 +316,7 @@
<field name="name">View sprint Tasks</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('product_backlog_id', '=', 'S('+str(active_id)+')')]</field>
<field name="domain">[('product_backlog_id', '=', active_id)]</field>
</record>
<record id="ir_scrum_sprint_open_task" model="ir.values">
<field eval=" 'tree_but_open'" name="key2"/>
addons/scrum/wizard/backlog_to_task.py
+2 -1
View File
@@ -46,7 +46,8 @@ def _do_create(self, cr, uid, data, context):
'description': backlog.note,
'project_id': backlog.project_id.id,
'user_id': (backlog.user_id and backlog.user_id.id) or uid,
'priority': backlog.priority
'priority': backlog.priority,
'planned_hours': backlog.planned_hours
}))
value = {
addons/stock/stock.py
+10 -6
View File
@@ -1405,12 +1405,16 @@ class stock_picking_move_wizard(osv.osv_memory):
for act in self.read(cr,uid,ids):
move_lines=move_obj.browse(cr,uid,act['move_ids'])
for line in move_lines:
picking_obj.write(cr,uid,[line.picking_id.id],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
picking_obj.write(cr,uid,[act['picking_id']],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
cr.commit()
old_picking=picking_obj.read(cr,uid,[line.picking_id.id])[0]
if not len(old_picking['move_lines']):
picking_obj.write(cr,uid,[old_picking['id']],{'state':'done'})
if line.picking_id:
picking_obj.write(cr,uid,[line.picking_id.id],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
picking_obj.write(cr,uid,[act['picking_id']],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
cr.commit()
old_picking=picking_obj.read(cr,uid,[line.picking_id.id])[0]
if not len(old_picking['move_lines']):
picking_obj.write(cr,uid,[old_picking['id']],{'state':'done'})
else:
raise osv.except_osv(_('UserError'),
_('You can not create new moves.'))
return {'type':'ir.actions.act_window_close' }
stock_picking_move_wizard()