commit
c2bd010515
|
@ -72,18 +72,20 @@
|
|||
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Table_Grant_Total">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<blockLeftPadding length="13.0" start="0,0" stop="-1,0"/>
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Table_Account_Detail">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,0" stop="-1,0"/>
|
||||
<blockLeftPadding length="13.0" start="0,0" stop="-1,0"/>
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Table_Move_Line_Detail">
|
||||
<blockAlignment value="LEFT"/>
|
||||
|
@ -125,6 +127,7 @@
|
|||
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
<paraStyle name="terp_default_Centre_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
|
@ -162,7 +165,7 @@
|
|||
<para style="terp_default_8">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Sub_detail">
|
||||
<blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Sub_detail">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Centre">Period from </para>
|
||||
|
@ -175,7 +178,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
<blockTable colWidths="161.0,161.0,161.0" style="Table_Sub_Content">
|
||||
<blockTable colWidths="178.0,178.0,178.0" style="Table_Sub_Content">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Centre">[[ data['form']['date1'] ]]</para>
|
||||
|
@ -192,7 +195,7 @@
|
|||
<font color="white"> </font>
|
||||
</para>
|
||||
<section>
|
||||
<blockTable colWidths="67.0,245.0,59.0,59.0,58.0" style="Table_Header_Title" repeatRows="1">
|
||||
<blockTable colWidths="67.0,296.0,59.0,59.0,58.0" style="Table_Header_Title" repeatRows="1">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Centre">Code / Date</para>
|
||||
|
@ -212,10 +215,10 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Grant_Total">
|
||||
<blockTable colWidths="62.0,300.0,57.0,57.0,57.0" style="Table_Grant_Total">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_Centre_Bold_9">Total :</para>
|
||||
<para style="terp_default_Bold_9">Total :</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Bold_9"><font color="white"> </font></para>
|
||||
|
@ -236,10 +239,10 @@
|
|||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
|
||||
<blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Account_Detail">
|
||||
<blockTable colWidths="55.0,306.0,58.0,57.0,57.0" style="Table_Account_Detail">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_Centre_Bold_9">[[ o.code ]]</para>
|
||||
<para style="terp_default_Bold_9">[[ o.code ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
|
||||
|
@ -258,10 +261,10 @@
|
|||
<tr>
|
||||
<td>
|
||||
<para style="Standard">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
|
||||
<blockTable colWidths="55.0,249.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
|
||||
<blockTable colWidths="55.0,300.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_Centre_Bold_9">[[ move_g['code'] ]]</para>
|
||||
<para style="terp_default_Bold_9">[[ move_g['code'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
|
||||
|
@ -279,7 +282,7 @@
|
|||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_9">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
|
||||
<blockTable colWidths="48.0,248.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
|
||||
<blockTable colWidths="48.0,299.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_8_Italic_Center">[[ move_a['date'] ]]</para>
|
||||
|
@ -315,4 +318,4 @@
|
|||
<font color="white"> </font>
|
||||
</para>
|
||||
</story>
|
||||
</document>
|
||||
</document>
|
|
@ -555,9 +555,9 @@ class partner_balance(report_sxw.rml_parse):
|
|||
'AND l.reconcile_id IS NULL ' \
|
||||
'GROUP BY partner_id',
|
||||
(self.date_lst[0],))
|
||||
|
||||
print"self.cr.fetchone()[0]",self.cr.fetchone()
|
||||
if self.cr.fetchone() != None:
|
||||
result_tmp = float(self.cr.fetchone()[0])
|
||||
result_tmp = float(self.cr.fetchone()[0]) or 0.0
|
||||
else:
|
||||
result_tmp = 0.0
|
||||
#
|
||||
|
|
|
@ -40,17 +40,16 @@ period_form = '''<?xml version="1.0"?>
|
|||
<separator string="Filters" colspan="4"/>
|
||||
<field name="state" required="True"/>
|
||||
<newline/>
|
||||
<group colspan="4">
|
||||
<group attrs="{'invisible':[('state','=','byperiod'),('state','=','none')]}" colspan="2">
|
||||
|
||||
<group attrs="{'invisible':[('state','=','byperiod'),('state','=','none')]}" colspan="4">
|
||||
<separator string="Date Filter" colspan="4"/>
|
||||
<field name="date1"/>
|
||||
<newline/>
|
||||
<field name="date2"/>
|
||||
</group>
|
||||
<group attrs="{'invisible':[('state','=','bydate'),('state','=','none')]}" colspan="2">
|
||||
<group attrs="{'invisible':[('state','=','bydate'),('state','=','none')]}" colspan="4">
|
||||
<separator string="Filter on Periods" colspan="4"/>
|
||||
<field name="periods" colspan="4" nolabel="1"/>
|
||||
</group>
|
||||
|
||||
</group>
|
||||
</form>'''
|
||||
|
||||
|
@ -60,7 +59,7 @@ period_fields = {
|
|||
'string':"Date/Period Filter",
|
||||
'type':'selection',
|
||||
'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
|
||||
'default': lambda *a:'byperiod'
|
||||
'default': lambda *a:'all'
|
||||
},
|
||||
'fiscalyear': {
|
||||
'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
|
||||
|
@ -117,7 +116,6 @@ class wizard_report(wizard.interface):
|
|||
else:
|
||||
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
|
||||
|
||||
|
||||
states = {
|
||||
'init': {
|
||||
'actions': [_get_defaults],
|
||||
|
|
Loading…
Reference in New Issue