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

[IMP] point_of_sale,mrp,auction: Improvements according to checklist guidelines. 

bzr revid: uco@tinyerp.com-20100917062125-b97bn6da94g9fd0n
This commit is contained in:
uco (Open ERP) 2010-09-17 11:51:25 +05:30
parent 5fc9262ee5
commit fa4beb9fa1
8 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/auction/auction_view.xml
View File

@ -388,8 +388,9 @@
string="Sold" help="Buy object"
domain="[('state','=','sold')]"/>
<separator orientation="vertical"/>
<field name="name" string="Object Name"/>
<field name="lot_type"/>
<field name="name"/>
<field name="ach_uid"/>
<field name="bord_vnd_id"/>
<field name="state"/>
<newline/>
<group expand="0" string="Group By..." colspan="16">

18
addons/mrp/report/mrp_production_order_view.xml
View File

@ -48,17 +48,17 @@
<field name="arch" type="xml">
<search string="Search">
<group col="16" colspan="6">
<filter icon="terp-go-year" string=" 365 Days "
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
<filter icon="terp-go-year" string="This Year"
domain="[('year','=',time.strftime('%%Y'))]"
help="Production performed in last 365 Days"/>
<filter icon="terp-go-month" string=" 30 Days "
<filter icon="terp-go-month" string="This Month"
name="month"
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
domain="[('month','=',time.strftime('%%m'))]"
help="Production performed in last 30 days"/>
<filter icon="terp-go-week"
string=" 7 Days "
string="Month -1"
separator="1"
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Production during last 7 days"/>
<separator orientation="vertical"/>
<filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
@ -79,10 +79,12 @@
<separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
<separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<separator orientation="vertical"/>
<filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
<separator orientation="vertical"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>

2
addons/point_of_sale/pos_view.xml
View File

@ -49,7 +49,7 @@
<separator colspan="4"/>
<group colspan="4" col="6">
<field name="state" />
<button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" />
<button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="terp-dolar" type="action" states="draft,advance" />
<button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
<button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
<button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"

12
addons/point_of_sale/wizard/pos_box_entries.xml
View File

@ -14,11 +14,13 @@
<field name="journal_id"/>
<field name="product_id"/>
<field name="amount"/>
<group colspan="4" col="2">
<button icon='gtk-cancel' special="cancel"
string="Close" />
<button name="get_in" string="Put Money"
colspan="1" type="object" icon="gtk-ok" />
<separator colspan="4"/>
<group colspan="4" col="4">
<group col="2" colspan="2"/>
<button icon="gtk-stop" special="cancel"
string="_Cancel" />
<button name="get_in" string="_Put Money"
colspan="1" type="object" icon="terp-dolar_ok!" />
</group>
</form>
</field>

14
addons/point_of_sale/wizard/pos_box_out.xml
View File

@ -14,12 +14,14 @@
<field name="journal_id"/>
<field name="product_id"/>
<field name="amount"/>
<group colspan="4" col="2">
<button icon='gtk-cancel' special="cancel"
string="Close" />
<button name="get_out" string="Take Money"
colspan="1" type="object" icon="gtk-ok" />
</group>
<separator colspan="4"/>
<group colspan="4" col="4">
<group col="2" colspan="2"/>
<button icon="gtk-stop" special="cancel"
string="_Cancel" />
<button name="get_out" string="_Take Money"
colspan="1" type="object" icon="terp-dolar" />
</group>
</form>
</field>
</record>

14
addons/point_of_sale/wizard/pos_close_statement.xml
View File

@ -9,11 +9,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Close Statements">
<separator string="Are you sure you want to close the statements ?" colspan="4"/>
<button icon='gtk-cancel' special="cancel"
string="No" colspan="1" />
<button name="close_statement" string="Yes"
colspan="1" type="object" icon="gtk-ok"/>
<label string="Are you sure you want to close the statements ?"/>
<separator colspan="4"/>
<group col="4" colspan="4">
<group col="2" colspan="2"/>
<button icon='gtk-stop' special="cancel"
string="_No" />
<button name="close_statement" string="_Yes"
type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>

14
addons/point_of_sale/wizard/pos_open_statement.xml
View File

@ -9,11 +9,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Open Statements">
<separator string="Are you sure you want to open the statements ?" colspan="4"/>
<button icon='gtk-cancel' special="cancel"
string="No" />
<button name="open_statement" string="Yes"
type="object" icon="gtk-ok"/>
<label string="Are you sure you want to open the statements ?"/>
<separator colspan="4"/>
<group col="4" colspan="4">
<group col="2" colspan="2"/>
<button icon='gtk-stop' special="cancel"
string="_No" />
<button name="open_statement" string="_Yes"
type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>

11
addons/point_of_sale/wizard/pos_payment.xml
View File

@ -12,7 +12,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Add payment :">
<group colspan="4" width="600" height="200">
<group colspan="4" width="600" height="220">
<field name="journal"/>
<field name="amount" />
<field name="payment_date" />
@ -29,10 +29,11 @@
<field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
<field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
</group>
<newline/>
<group col="2" colspan="4">
<button icon='gtk-cancel' special="cancel" string="Cancel" />
<button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-ok"/>
<separator colspan="4"/>
<group col="4" colspan="4">
<group col="2" colspan="2"/>
<button icon='gtk-stop' special="cancel" string="_Cancel" />
<button name="check" string="Ma_ke Payment" colspan="1" type="object" icon="terp-dolar"/>
</group>
</group>
</form>