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

[MERGE] improvements in module POS (data and views)

Browse Source 
bzr revid: rco@openerp.com-20110523081647-n2l58vwwqe5xvbyv
This commit is contained in:
Raphael Collet
2011-05-23 10:16:47 +02:00
parent 874ee8b49e 7c3c895631
commit ae6efe3358
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/account_statement_demo.xml
+3
View File
@@ -5,6 +5,7 @@
<field name="name">Visa Journal</field>
<field name="code">VIJ</field>
<field name="type">cash</field>
<field eval="1" name="check_dtls"/>
<field name="view_id" ref="account.account_journal_view"/>
<field name="sequence_id" ref="account.sequence_journal"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
@@ -30,6 +31,7 @@
<field name="name">Bancontact Journal</field>
<field name="code">BACJ</field>
<field name="type">cash</field>
<field eval="1" name="check_dtls"/>
<field name="view_id" ref="account.account_journal_view"/>
<field name="sequence_id" ref="account.sequence_journal"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
@@ -68,6 +70,7 @@
<record id="account.cash_journal" model="account.journal">
<field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
<field eval="1" name="check_dtls"/>
</record>
</data>
addons/point_of_sale/account_statement_view.xml
+3 -3
View File
@@ -10,12 +10,12 @@
<xpath expr="//notebook[last()]" position="inside">
<page string="Point of Sale">
<group col="6" colspan="4">
<separator colspan="6" string="Extended Configureation"/>
<field name="check_dtls" groups="point_of_sale.group_pos_manager"/>
<separator colspan="6" string="Extended Configuration"/>
<field name="check_dtls" groups="point_of_sale.group_pos_manager" string="Check Cash Balance"/>
<field name="auto_cash"/>
<field name="special_journal"/>
</group>
<separator colspan="4" string="Users"/>
<separator colspan="4" string="POS Users"/>
<field name="journal_users" nolabel="1" colspan="4"/>
</page>
</xpath>
addons/point_of_sale/point_of_sale_demo.xml
+18
View File
@@ -7,6 +7,24 @@
<record id="account.cash_journal" model="account.journal">
<field eval="[(6, 0, [ref('base.user_root')])]" name="journal_users"/>
</record>
<record id="product_product_putmoneyforchange0" model="product.product">
<field name="supply_method">buy</field>
<field name="uom_id" ref="product.product_uom_unit"/>
<field name="name_template">Cash In</field>
<field name="property_account_income" ref="account.cash"/>
<field name="name">Cash In</field>
<field eval="1" name="income_pdt"/>
</record>
<record id="product_product_putmoneyforchange1" model="product.product">
<field name="supply_method">buy</field>
<field name="uom_id" ref="product.product_uom_unit"/>
<field name="name_template">Cash Out</field>
<field name="property_account_income" ref="account.cash"/>
<field name="name">Cash Out</field>
<field eval="1" name="expense_pdt"/>
</record>
<record id="account_invoice_invoicefrompospos0" model="account.invoice">
<field name="origin">POS/019</field>
addons/point_of_sale/point_of_sale_view.xml
+2 -2
View File
@@ -657,8 +657,8 @@
<xpath expr="/form/notebook/page/group[@name='misc']" position="before">
<group colspan="2" col="2">
<separator string="Point of Sale" colspan="2"/>
<field name="income_pdt"/>
<field name="expense_pdt"/>
<field name="income_pdt" string="Product for Input Operation"/>
<field name="expense_pdt" string="Product for Output Operation"/>
<field name="am_out"/>
<field name="disc_controle"/>
</group>