qdp (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/qdp-l10n_us into
lp:~openerp-dev/openobject-addons/dsh-l10n_us.
Requested reviews:
dsh (Open ERP) (dsh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/qdp-l10n_us/+merge/55141
merge some of the improvements of David Mitchell from NovaPoint + redesign form
view of check
Remaining things to do:
- set defaut and demo data in order to have a check sequence given on the check
journal
- (to be discussed) set check sequence field as mandatory on account.journal if
allow_check is True
- fill the check number of voucher when posting/validating the check
- check rml improvements made by NovaPoint and merge the interesting things
Thanks,
Quentin
--
https://code.launchpad.net/~openerp-dev/openobject-addons/qdp-l10n_us/+merge/55141
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/dsh-l10n_us.
=== modified file 'account_check_writing/__openerp__.py'
--- account_check_writing/__openerp__.py 2011-01-18 01:33:32 +0000
+++ account_check_writing/__openerp__.py 2011-03-28 13:09:33 +0000
@@ -21,7 +21,7 @@
{
"name" : "Check writing",
"version" : "1.1",
- "author" : "OpenERP SA",
+ "author" : "OpenERP SA, NovaPoint Group",
"category": "Generic Modules/Accounting",
"description": """
Module for the Check writing and check printing
@@ -30,8 +30,10 @@
'init_xml': [],
"depends" : [
"account_voucher",
+ "account_accountant",
],
'update_xml': [
+ 'check_sequence.xml',
'account_check_writing_report.xml',
'account_view.xml',
'account_voucher_view.xml',
=== modified file 'account_check_writing/account.py'
--- account_check_writing/account.py 2010-12-23 18:25:45 +0000
+++ account_check_writing/account.py 2011-03-28 13:09:33 +0000
@@ -26,6 +26,8 @@
_columns = {
'allow_check_writing': fields.boolean('Allow Check writing', help='Fill this if the journal is to be used for writing checks.'),
+ 'use_preprint_check': fields.boolean('Use Preprinted Check'),
+ 'check_sequence': fields.many2one('ir.sequence', 'Check Sequence', help="This field contains the information related to the numbering of the check number."),
}
account_journal()
=== modified file 'account_check_writing/account_view.xml'
--- account_check_writing/account_view.xml 2011-01-18 01:33:32 +0000
+++ account_check_writing/account_view.xml 2011-03-28 13:09:33 +0000
@@ -10,11 +10,16 @@
<field name="name">account.journal.form</field>
<field name="model">account.journal</field>
<field name="type">form</field>
- <field name="inherit_id" ref="account.view_account_journal_form" />
+ <field name="inherit_id" ref="account.view_account_journal_form" />
<field name="arch" type="xml">
- <field name="type" on_change="onchange_type(type, currency)"/>
+ <field name="type" on_change="onchange_type(type, currency)" />
<field name="entry_posted" position="after">
- <field name="allow_check_writing" attrs="{'readonly':[('type','!=','bank')]}"/>
+ <field name="allow_check_writing" attrs="{'readonly':[('type','!=','bank')]}" />
+ <field name="use_preprint_check" attrs="{'readonly':[('type','!=','bank')]}" />
+ </field>
+ <field name="sequence_id" required="0" position="after">
+ <field name="check_sequence"
+ attrs="{'readonly':[('allow_check_writing','=',False)]}" />
</field>
</field>
</record>
=== modified file 'account_check_writing/account_voucher.py'
--- account_check_writing/account_voucher.py 2011-02-04 01:19:58 +0000
+++ account_check_writing/account_voucher.py 2011-03-28 13:09:33 +0000
@@ -38,6 +38,7 @@
_columns = {
'amount_in_word' : fields.char("Amount in word" , size=128, readonly=True, states={'draft':[('readonly',False)]}),
'allow_check' : fields.boolean('Allow Check Writing'), # attrs does not support '.' format and fields.relates get the value when v save the record
+ 'chk_seq' : fields.char("Check Number" , size=64, readonly=True),
}
@@ -82,7 +83,6 @@
if journal_id:
allow_check_writing = self.pool.get('account.journal').browse(cr, uid, journal_id).allow_check_writing
default['value'].update({'allow_check':allow_check_writing})
-
return default
def print_check(self, cr, uid, ids, context=None):
=== modified file 'account_check_writing/account_voucher_view.xml'
--- account_check_writing/account_voucher_view.xml 2011-02-24 17:23:49 +0000
+++ account_check_writing/account_voucher_view.xml 2011-03-28 13:09:33 +0000
@@ -2,7 +2,7 @@
<openerp>
<data>
- <record model="ir.ui.view" id="view_vendor_payment_check_form">
+<!-- <record model="ir.ui.view" id="view_vendor_payment_check_form">
<field name="name">account.voucher.payment.check.form</field>
<field name="model">account.voucher</field>
<field name="type">form</field>
@@ -30,7 +30,7 @@
</button>
</field>
</record>
-
+-->
<record model="ir.ui.view" id="view_payment_write_check_form">
<field name="name">account.voucher.payment.write.check.form</field>
<field name="model">account.voucher</field>
@@ -38,24 +38,25 @@
<field name="arch" type="xml">
<form string="Customer 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)" string="Pay to the order of"/>
+ <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
<field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
- <field name="reference" />
+ <field name="chk_seq" />
<field name="journal_id"
domain="[('type','=','bank' ),('allow_check_writing','=',True)]"
widget="selection" select="1"
on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
string="Payment Method"/>
<field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Amount"/>
+ <field name="amount_in_word" colspan="2"/>
+ <field name="reference" />
<field name="allow_check" invisible="1"/>
- <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="2"/>
- <field name="reference" select="1" string="Payment Ref"/>
<field name="name" colspan="4"/>
<field name="account_id"
widget="selection"
invisible="True"/>
<field name="type" invisible="True"/>
<field name="currency_id" invisible="True"/>
+ <field name="company_id" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="Payment Information">
=== added file 'account_check_writing/check_sequence.xml'
--- account_check_writing/check_sequence.xml 1970-01-01 00:00:00 +0000
+++ account_check_writing/check_sequence.xml 2011-03-28 13:09:33 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data noupdate="0">
+ <record forcecreate="1" id="seq_type_payment_order" model="ir.sequence.type">
+ <field name="name">Check Number</field>
+ <field name="code">account.voucher.check</field>
+ </record>
+ </data>
+</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help : https://help.launchpad.net/ListHelp
