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

[IMP] sale and sale_journal:-useability improvements 

bzr revid: mtr@mtr-20100923134620-8x3xnn7tjlg1k0fw
This commit is contained in:
mtr 2010-09-23 19:16:20 +05:30
parent 9442cea321
commit 85e30424c7
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/sale/report/sale_report_view.xml
View File

@ -53,12 +53,12 @@
<group>
<filter icon="terp-go-year" string=" Year "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
help="Sales order created in last 365 days"/>
help="Sales order created in current year"/>
<filter icon="terp-go-month" string=" Month "
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
help="Sales order created in last 30 days"/>
<filter icon="terp-go-week"
help="Sales order created in current month"/>
<filter icon="terp-go-month"
string=" Month-1 "
separator="1"
domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"

4
addons/sale/sale_view.xml
View File

@ -268,12 +268,12 @@
</field>
<newline/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
<separator orientation="vertical"/>
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
</group>
</search>
</field>

8
addons/sale_journal/sale_journal_view.xml
View File

@ -17,11 +17,9 @@
<field name="invoicing_method" select="1"/>
<field name="active" select="1"/>
</group>
<notebook>
<page string="Notes">
<field name="note" colspan="2" nolabel="1"/>
</page>
</notebook>
<separator string="Notes" colspan="3"/>
<newline/>
<field name="note" colspan="3" nolabel="1"/>
</form>
</field>
</record>