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

[MERGE] merge with main branch

Browse Source 
bzr revid: mra@mra-laptop-20100802095918-7caj41efbvrao0ts
This commit is contained in:
Mustufa Rangwala
2010-08-02 15:29:18 +05:30
parent 2b2cc11862 f0f0dfa7a1
commit c9bc07d201
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_voucher/voucher_view.xml
+17 -15
View File
@@ -88,7 +88,8 @@
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
<filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<filter icon="terp-stock_effects-object-colorize" string="Reviewed" domain="[('state','=','audit')]" groups="base.group_extended" help="To Review"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
<separator orientation="vertical"/>
<field name="reference" select="1"/>
@@ -96,6 +97,9 @@
<field name="name" select='1'/>
<field name="account_id" select="1"/>
<field name="partner_id" select='1'/>
<newline/>
<field name="narration" select="1"/>
<field name="date" select='1'/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="12" col="10">
@@ -107,10 +111,7 @@
<newline/>
<group expand="0" string="Extended options...">
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
<field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
<separator orientation="vertical"/>
<field name="narration" select="1"/>
<field name="date" select='1'/>
<field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
</group>
</search>
</field>
@@ -124,7 +125,8 @@
<group col='8' colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
<filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','audit')]" help="Posted Vouchers"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
<separator orientation="vertical"/>
@@ -133,14 +135,14 @@
<field name="name" select='1'/>
<field name="account_id" select="1"/>
<field name="partner_id" select='1'/>
<newline/>
<field name="narration" select="1"/>
<field name="date" select='1'/>
</group>
<newline/>
<group col='8' colspan='4'>
<field name="journal_id" widget="selection" select="1"/>
<field name="period_id" widget="selection" select="1"/>
<separator orientation="vertical"/>
<field name="narration" select="1"/>
<field name="date" select='1'/>
<field name="period_id" widget="selection" select="1"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="12" col="10">
@@ -250,10 +252,10 @@
<field name="search_view_id" ref="view_voucher_filter_new"/>
</record>
<menuitem
id="menu_action_review_voucher_list"
action="action_review_voucher_list"
parent="account.periodical_processing_journal_entries_validation" sequence="2"/>
<!-- <menuitem -->
<!-- id="menu_action_review_voucher_list"-->
<!-- action="action_review_voucher_list" -->
<!-- parent="account.periodical_processing_journal_entries_validation" sequence="2"/>-->
<!-- -->
</data>
</openerp>
addons/point_of_sale/pos_view.xml
+1 -1
View File
@@ -175,7 +175,7 @@
</field>
</record>
<menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="3" />
<menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
<menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
<menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
addons/point_of_sale/statement_view.xml
+2 -5
View File
@@ -93,7 +93,7 @@
sequence="3"
/>
<menuitem name="Opening Operations" parent="point_of_sale.menu_point_root"
<menuitem name="Register management" parent="point_of_sale.menu_point_root"
id="menu_point_open_config" sequence="1"/>
<menuitem
name="Open my Cash Registers" parent="menu_point_open_config"
@@ -101,11 +101,8 @@
action="action_pos_open_statement"
id="menu_open_statement" sequence="1" />
<menuitem name="Closing Operations" parent="point_of_sale.menu_point_root"
id="menu_point_close_config" sequence="3"/>
<menuitem
name="Close my Cash Register" parent="menu_point_close_config"
name="Close my Cash Register" parent="menu_point_open_config"
string="Close my Cash Register"
action="action_pos_close_statement"
id="menu_close_statement" sequence="2" />