Pankita Shah(OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-Accounting-Report-Wizard-shp
into lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-Accounting-Report-Wizard-shp/+merge/113945
Hello,
I am improve Accounting reports wizards and Supplier invoice/refund.
Thanks
Pankita
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-Accounting-Report-Wizard-shp/+merge/113945
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-07-06 06:03:27 +0000
+++ account/account_invoice_view.xml 2012-07-09 10:37:22 +0000
@@ -163,38 +163,35 @@
<sheet string="Supplier Invoice">
<div class="oe_title">
<h1>
- <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
+ <label string="Draft Invoice/ref " attrs="{'invisible': [('state','not in',('draft',))]}"/>
<label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
<label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
+ <span attr="{'invisible': [('origin','=',False)]}"> - </span>
+ <field name="origin" placeholder="PO 002" class="oe_inline"/>
<field name="number" readonly="1" class="oe_inline"/>
</h1>
- <label string="Concerns" for="origin" class="oe_edit_only"/>
- <h2>
- <field name="origin" placeholder="PO 002"/> From
- <field string="Supplier" name="partner_id"
+ </div>
+ <group>
+ <group>
+ <field string="Supplier" name="partner_id"
on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
domain="[('supplier', '=', True)]"/>
- </h2>
- </div>
- <group>
- <group>
- <field name="date_invoice"/>
- <field name="date_due"/>
- <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
- <label for="reference"/>
+ <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+ <field name="reference_type" class="oe_inline" nolabel="1"/>
<div>
- <field name="reference_type"/>
- <field name="reference" placeholder="Payment Reference"/>
+ <field name="reference" placeholder="Payment Reference" class="oe_inline"/>
</div>
</group>
<group>
+ <field name="date_invoice"/>
+ <field name="date_due"/>
<field name="fiscal_position" widget="selection"/>
+ <field name="currency_id"/>
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
groups="account.group_account_user"/>
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
name="account_id" groups="account.group_account_user"/>
- <field name="currency_id"/>
<field name="type" invisible="1"/>
</group>
</group>
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-07-06 06:03:27 +0000
+++ account/account_view.xml 2012-07-09 10:37:22 +0000
@@ -17,7 +17,6 @@
<button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
<field name="state" widget="statusbar" nolabel="1" />
</header>
- <sheet string="Fiscalyear" >
<group>
<group>
<field name="name"/>
@@ -41,7 +40,6 @@
</group>
</form>
</field>
- </sheet>
</form>
</field>
</record>
=== modified file 'account/wizard/account_report_common_view.xml'
--- account/wizard/account_report_common_view.xml 2012-06-29 08:30:24 +0000
+++ account/wizard/account_report_common_view.xml 2012-07-09 10:37:22 +0000
@@ -26,12 +26,12 @@
<field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
</group>
<group string="Dates" col="4">
- <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
- <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
+ <field name="date_from" attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
+ <field name="date_to" attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
</group>
<group string="Periods" col="4">
- <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
- <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+ <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+ <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
</group>
</page>
<page string="Journals" name="journal_ids">
_______________________________________________
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
