Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1099432-vba into lp:openobject-addons

  1. trunk-bug-1099432-vba
  2. Merge into trunk
Proposed by Vijaykumar Baladaniya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1099432-vba
Merge into: lp:openobject-addons
Diff against target: 47 lines (+4/-4)
3 files modified
account/account.py (+1/-1)
point_of_sale/account_bank_statement.py (+1/-1)
point_of_sale/point_of_sale_view.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1099432-vba
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+143233@code.launchpad.net

Description of the change

Hello Sir,

    All changes applied related to bug: [https://bugs.launchpad.net/openobject-addons/+bug/1099432].
    Kindly review the code.

Thanks,
 vba

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-bug-1099432-vba updated
8505. By Arnaud Pineux (OpenERP)

[IMP] 'point of sales' changed into 'points of sale'

Unmerged revisions

8505. By Arnaud Pineux (OpenERP)

[IMP] 'point of sales' changed into 'points of sale'

8504. By Vijaykumar Baladaniya (OpenERP)

[FIX] Improve point of sale wizard.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account.py'
2--- account/account.py 2012-12-19 11:34:13 +0000
3+++ account/account.py 2013-01-15 09:23:22 +0000
4@@ -729,7 +729,7 @@
5 'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
6 'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
7 'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
8- 'cash_control' : fields.boolean('Cash Control', help='If you want the journal should be control at opening/closing, check this option'),
9+ 'cash_control' : fields.boolean('Cash Control', help='Check this option if you want to control the journal at opening/closing'),
10 }
11
12 _defaults = {
13
14=== modified file 'point_of_sale/account_bank_statement.py'
15--- point_of_sale/account_bank_statement.py 2012-12-06 14:56:32 +0000
16+++ point_of_sale/account_bank_statement.py 2013-01-15 09:23:22 +0000
17@@ -25,7 +25,7 @@
18 class account_journal(osv.osv):
19 _inherit = 'account.journal'
20 _columns = {
21- 'journal_user': fields.boolean('PoS Payment Method', help="Check this box if this journal define a payment method that can be used in point of sales."),
22+ 'journal_user': fields.boolean('PoS Payment Method', help="Check this box if this journal define a payment method that can be used in points of sale."),
23
24 'amount_authorized_diff' : fields.float('Amount Authorized Difference'),
25 'self_checkout_payment_method' : fields.boolean('Self Checkout Payment Method'),
26
27=== modified file 'point_of_sale/point_of_sale_view.xml'
28--- point_of_sale/point_of_sale_view.xml 2012-12-08 16:20:31 +0000
29+++ point_of_sale/point_of_sale_view.xml 2013-01-15 09:23:22 +0000
30@@ -837,7 +837,7 @@
31 domain="[('config_id', '=', active_id)]" />
32
33 <record model="ir.actions.act_window" id="action_pos_config_pos">
34- <field name="name">Point of Sales</field>
35+ <field name="name">Points of Sale</field>
36 <field name="type">ir.actions.act_window</field>
37 <field name="res_model">pos.config</field>
38 <field name="view_type">form</field>
39@@ -990,7 +990,7 @@
40 <field name="user_id" />
41 <group expand="0" string="Group By...">
42 <filter string="User" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
43- <filter string="Point of Sales" domain="[]" context="{'group_by': 'user_id'}" />
44+ <filter string="Points of Sale" domain="[]" context="{'group_by': 'user_id'}" />
45 </group>
46 </search>
47 </field>

Subscribers

People subscribed via source and target branches

to all changes: