Ujjvala Collins (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-pos_output_operations-uco into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-pos_output_operations-uco/+merge/75140
[IMP] point_of_sale:
--------------------------------
Point 8: OUTPUT operations wizard
* Rename Operation into Operation Type
* Amount must be required
* Change layout : Description Operation Type
Cash Register Amount
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-pos_output_operations-uco/+merge/75140
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-pos_output_operations-uco.
=== modified file 'point_of_sale/wizard/pos_box_out.py'
--- point_of_sale/wizard/pos_box_out.py 2011-04-26 07:39:18 +0000
+++ point_of_sale/wizard/pos_box_out.py 2011-09-13 09:52:43 +0000
@@ -51,8 +51,8 @@
_columns = {
'name': fields.char('Description', size=32, required=True),
'journal_id': fields.selection(pos_box_entries.get_journal, "Cash Register", required=True),
- 'product_id': fields.selection(_get_expense_product, "Operation", required=True),
- 'amount': fields.float('Amount', digits=(16, 2)),
+ 'product_id': fields.selection(_get_expense_product, "Operation Type", required=True),
+ 'amount': fields.float('Amount', digits=(16, 2), required=True),
'ref': fields.char('Ref', size=32),
}
_defaults = {
=== modified file 'point_of_sale/wizard/pos_box_out.xml'
--- point_of_sale/wizard/pos_box_out.xml 2011-01-14 00:11:01 +0000
+++ point_of_sale/wizard/pos_box_out.xml 2011-09-13 09:52:43 +0000
@@ -3,25 +3,25 @@
<data>
<!-- Box Entries -->
- <record id="view_pos_box_out" model="ir.ui.view">
+ <record id="view_pos_box_out" model="ir.ui.view">
<field name="name">Box Out</field>
<field name="model">pos.box.out</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Output Operation">
- <separator string="Please fill these fields for entries to the box:" colspan="4"/>
- <field name="name"/>
- <field name="journal_id"/>
- <field name="product_id"/>
- <field name="amount"/>
- <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>
+ <separator string="Please fill these fields for entries to the box:" colspan="4"/>
+ <field name="name"/>
+ <field name="product_id"/>
+ <field name="journal_id"/>
+ <field name="amount"/>
+ <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>
@@ -35,5 +35,5 @@
<field name="target">new</field>
</record>
- </data>
+ </data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp