openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #03024
[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
Purnendu Singh (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#568537 The __compute method of account_account needs optmization to improve Accounting Performance!
https://bugs.launchpad.net/bugs/568537
#588776 Error when closing fiscal year
https://bugs.launchpad.net/bugs/588776
#686508 Not able to validate sales receipt
https://bugs.launchpad.net/bugs/686508
#686513 Not able to validate supplier vouchers
https://bugs.launchpad.net/bugs/686513
#691218 add an employee to a department
https://bugs.launchpad.net/bugs/691218
#692139 Account Journal onchange_type method context undefined error
https://bugs.launchpad.net/bugs/692139
#692962 In hr contract, shouldn't be able to enter an end date lower than a start date
https://bugs.launchpad.net/bugs/692962
#693476 [6.0] sale manager dashboard - "Sales by Customer" - incomplete
https://bugs.launchpad.net/bugs/693476
#693810 [RC1]Pay button when you pay directly in Sales receipt form
https://bugs.launchpad.net/bugs/693810
#693833 [6.0] performance issues - stock_move, account_move_lines and others
https://bugs.launchpad.net/bugs/693833
#694937 [6.0] account entry analysis - unreconciled does not filter
https://bugs.launchpad.net/bugs/694937
#695439 membership: can't open members via GTK client
https://bugs.launchpad.net/bugs/695439
#697080 Payment Invoice is not considering the currency in Invoice
https://bugs.launchpad.net/bugs/697080
#697207 Bug when sending followups without specifying any email address
https://bugs.launchpad.net/bugs/697207
#697714 Unclear warning on cancel opening entries
https://bugs.launchpad.net/bugs/697714
#699809 [6.0 and 5.0] Installing account_analytic_analysis you have a maximu of 2147 analytic accounts
https://bugs.launchpad.net/bugs/699809
#701895 [Trunk] account_analytic_plan break the creation of inovice from analytic lines
https://bugs.launchpad.net/bugs/701895
#702027 [trunk]hr_payroll minor typos
https://bugs.launchpad.net/bugs/702027
#705043 Selection of multi-company products account in invoices lines
https://bugs.launchpad.net/bugs/705043
#713116 [V6.01] BIG ISSUE - Bank statement do not handle correctly partial payment
https://bugs.launchpad.net/bugs/713116
#716271 manager user not get hr request send by employee
https://bugs.launchpad.net/bugs/716271
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2/+merge/49619
Hello sir,
Fixes:
https://bugs.launchpad.net/openobject-addons/+bug/713116
[V6.01] BIG ISSUE - Bank statement do not handle correctly partial payment
Add attas on buttons and fields on account.voucher object while calling from account bank statement.
Thanks
psi
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2/+merge/49619
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py 2011-02-14 07:20:45 +0000
+++ account_voucher/account_voucher.py 2011-02-14 12:57:14 +0000
@@ -759,7 +759,7 @@
else:
account_id = inv.partner_id.property_account_payable.id
move_line = {
- 'name': name,
+ 'name': inv.comment and inv.comment or name,
'account_id': account_id,
'move_id': move_id,
'partner_id': inv.partner_id.id,
=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml 2011-01-28 13:32:54 +0000
+++ account_voucher/voucher_payment_receipt_view.xml 2011-02-14 12:57:14 +0000
@@ -151,16 +151,17 @@
<field name="arch" type="xml">
<form string="Bill Payment">
<group col="6" colspan="4">
- <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
- <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+ <field name="partner_id" domain="[('supplier','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
+ <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
<field name="journal_id"
domain="[('type','in',['bank', 'cash'])]"
+ invisible="context.get('line_type', False)"
widget="selection" select="1"
on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
string="Payment Method"/>
- <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
- <field name="reference" select="1" string="Payment Ref"/>
- <field name="name" colspan="2"/>
+ <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+ <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
+ <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
<field name="account_id"
widget="selection"
invisible="True"/>
@@ -245,10 +246,10 @@
</notebook>
<group col="10" colspan="4">
<field name="state"/>
- <button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
- <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
- <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
- <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+ <button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+ <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile this record ?"/>
+ <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+ <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
</group>
</form>
</field>
@@ -288,18 +289,20 @@
<field name="arch" type="xml">
<form string="Customer Payment">
<group col="6" colspan="4">
- <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Customer"/>
+ <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Customer"/>
<field name="amount"
+ invisible="context.get('line_type', False)"
string="Paid Amount"
on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
<field name="journal_id"
domain="[('type','in',['bank', 'cash'])]"
+ invisible="context.get('line_type', False)"
widget="selection" select="1"
on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
string="Payment Method"/>
- <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
- <field name="reference" select="1" string="Payment Ref"/>
- <field name="name" colspan="2"/>
+ <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+ <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
+ <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
<field name="account_id"
widget="selection"
invisible="True"/>
@@ -384,10 +387,10 @@
</notebook>
<group col="10" colspan="4">
<field name="state"/>
- <button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
- <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
- <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
- <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+ <button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+ <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
+ <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+ <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
</group>
</form>
</field>
