ALL: review menu form,tree->tree,form
bzr revid: ced-5e86e8be45c5fdc0eb473e85e849a5f2244ca7eb
This commit is contained in:
ced
parent
490d193753
commit
fdc262d379
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
<record model="ir.actions.act_window" id="action_account_period_tree">
|
||||
<field name="res_model">account.period</field>
|
||||
<field name="view_type">tree</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="domain">[('state','=','draft')]</field>
|
||||
<field name="view_id" ref="view_account_period_tree"/>
|
||||
</record>
|
||||
|
|
@ -14,16 +14,5 @@
|
|||
id="menu_action_account_period_close_tree"
|
||||
action="action_account_period_tree" />
|
||||
|
||||
<record model="ir.actions.act_window" id="action_account_fiscalyear_tree">
|
||||
<field name="name">Old fiscal years</field>
|
||||
<field name="res_model">account.fiscalyear</field>
|
||||
<field name="view_type">tree</field>
|
||||
<field name="domain">[('state','=','done')]</field>
|
||||
<field name="view_id" ref="view_account_fiscalyear_tree"/>
|
||||
</record>
|
||||
<menuitem name="Financial Management/End of year treatments/Old fiscal years"
|
||||
id="menu_action_account_fiscalyear_close_tree"
|
||||
action="action_account_fiscalyear_tree"/>
|
||||
|
||||
</data>
|
||||
</terp>
|
||||
|
|
|
|||
|
|
@ -127,8 +127,8 @@
|
|||
<form string="Supplier invoice">
|
||||
<notebook>
|
||||
<page string="Invoice">
|
||||
<field name="journal_id" domain="[('type', '=', 'purchase')]" select="1"/>
|
||||
<field name="type" select="1" readonly="1"/>
|
||||
<field name="journal_id" domain="[('type', '=', 'purchase')]" select="2"/>
|
||||
<field name="type" select="2" readonly="1"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(type,partner_id)" select="1"/>
|
||||
<field name="address_invoice_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="account_id" domain="[('type','<>','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" />
|
||||
|
|
@ -136,11 +136,11 @@
|
|||
|
||||
|
||||
|
||||
<field name="name" select="1"/>
|
||||
<field name="name" select="2"/>
|
||||
<field name="reference" select="1"/>
|
||||
|
||||
<field name="check_total" required="1"/>
|
||||
<field name="currency_id" on_change="onchange_currency_id(currency_id)" select="1"/>
|
||||
<field name="check_total" required="2"/>
|
||||
<field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
|
||||
<field name="invoice_line" nolabel="1" colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}">
|
||||
<tree string="Invoice lines" editable="bottom">
|
||||
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, price_unit, parent.address_invoice_id)"/>
|
||||
|
|
@ -174,7 +174,7 @@
|
|||
<button name="button_compute" string="Compute" states="draft" type="object"/>
|
||||
<field name="amount_total"/>
|
||||
<label/>
|
||||
<field name="state" select="1"/>
|
||||
<field name="state" select="2"/>
|
||||
<group col="3" colspan="3">
|
||||
<button name="invoice_open" states="draft,proforma" string="Create"/>
|
||||
<button name="invoice_cancel" states="draft,proforma,sale,open" string="Cancel"/>
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
<newline/>
|
||||
<field name="partner_bank_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" />
|
||||
<field name="number" select="1"/>
|
||||
<field name="number" select="2"/>
|
||||
<field name="origin"/>
|
||||
<field name="address_contact_id" domain="[('partner_id','=',partner_id)]" colspan="4"/>
|
||||
<field name="move_id"/>
|
||||
|
|
@ -210,15 +210,15 @@
|
|||
<form string="Invoice">
|
||||
<notebook>
|
||||
<page string="Invoice">
|
||||
<field name="journal_id" select="1"/>
|
||||
<field name="type" select="1" readonly="1"/>
|
||||
<field name="journal_id" select="2"/>
|
||||
<field name="type" select="2" readonly="1"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(type,partner_id)" select="1"/>
|
||||
<field name="address_invoice_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="account_id" domain="[('type','<>','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" />
|
||||
<field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" />
|
||||
<field name="name" select="1"/>
|
||||
<field name="name" select="2"/>
|
||||
<field name="number" select="1"/>
|
||||
<field name="currency_id" on_change="onchange_currency_id(currency_id)" select="1"/>
|
||||
<field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
|
||||
|
||||
<field name="invoice_line" nolabel="1" widget="one2many_list" colspan="4"/>
|
||||
|
||||
|
|
@ -242,7 +242,7 @@
|
|||
<button name="button_compute" string="Compute" states="draft" type="object"/>
|
||||
<field name="amount_total"/>
|
||||
<label/>
|
||||
<field name="state" select="1"/>
|
||||
<field name="state" select="2"/>
|
||||
<group col="4" colspan="3" expand="1">
|
||||
<button name="invoice_proforma" states="draft" string="PRO-FORMA"/>
|
||||
<button name="invoice_open" states="draft,proforma" string="Create"/>
|
||||
|
|
@ -256,7 +256,7 @@
|
|||
<newline/>
|
||||
<field name="partner_bank_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="date_due" select="1"/>
|
||||
<field name="reference" select="1"/>
|
||||
<field name="reference" select="2"/>
|
||||
<field name="origin"/>
|
||||
<field name="address_contact_id" domain="[('partner_id','=',partner_id)]" colspan="4"/>
|
||||
<field name="move_id"/>
|
||||
|
|
|
|||
|
|
@ -112,14 +112,14 @@
|
|||
<notebook>
|
||||
<page string="General Information">
|
||||
<field name="name" select="1" colspan="4"/>
|
||||
<field name="company_id" select="1"/>
|
||||
<field name="company_id" select="2"/>
|
||||
<newline/>
|
||||
<field name="type" select="1"/>
|
||||
<field name="code" select="1"/>
|
||||
<field name="shortcut"/>
|
||||
<field name="sign"/>
|
||||
|
||||
<field name="currency_id" select="1"/>
|
||||
<field name="currency_id" select="2"/>
|
||||
<field name="close_method"/>
|
||||
<field name="reconcile"/>
|
||||
<newline/>
|
||||
|
|
@ -421,7 +421,7 @@
|
|||
</tree>
|
||||
</field>
|
||||
<group col="7" colspan="4">
|
||||
<field name="state" select="1"/>
|
||||
<field name="state" select="2"/>
|
||||
<field name="balance_end" />
|
||||
<button name="button_dummy" string="Compute" states="draft"/>
|
||||
<button name="button_confirm" string="Confirm" states="draft" type="object"/>
|
||||
|
|
@ -635,10 +635,10 @@
|
|||
<field name="name" select="1"/>
|
||||
<field name="company_id"/>
|
||||
<field name="tax_group" select="1"/>
|
||||
<field name="active" select="1" />
|
||||
<field name="active" select="2" />
|
||||
<field name="type" select="1"/>
|
||||
<field name="applicable_type"/>
|
||||
<field name="amount" select="1"/>
|
||||
<field name="amount" select="2"/>
|
||||
<field name="include_base_amount"/>
|
||||
<field name="domain"/>
|
||||
<newline/>
|
||||
|
|
@ -685,7 +685,7 @@
|
|||
<field name="name">Taxes</field>
|
||||
<field name="res_model">account.tax</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_tax_form"/>
|
||||
<field name="view_id" ref="view_tax_tree"/>
|
||||
</record>
|
||||
<menuitem name="Financial Management/Configuration/Taxes/" id="menu_action_tax_form" action="action_tax_form"/>
|
||||
|
||||
|
|
@ -928,7 +928,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">account.move</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_move_form"/>
|
||||
<field name="view_id" ref="view_move_tree"/>
|
||||
</record>
|
||||
<menuitem name="Financial Management/Entries/Entry lookup/" id="menu_action_move_line_form" action="action_move_line_form"/>
|
||||
|
||||
|
|
@ -937,8 +937,21 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">account.move.line</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_move_line_form"/>
|
||||
<field name="view_id" ref="view_move_line_tree"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_move_line_search_view1">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_move_line_tree"/>
|
||||
<field name="act_window_id" ref="action_move_line_search"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_move_line_search_view2">
|
||||
<field name="sequence" eval="20"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_move_line_form"/>
|
||||
<field name="act_window_id" ref="action_move_line_search"/>
|
||||
</record>
|
||||
|
||||
<menuitem name="Financial Management/Entries/Entry lookup/" id="menu_action_move_line_search" action="action_move_line_search"/>
|
||||
|
||||
<menuitem name="Financial Management/Charts" sequence="7"/>
|
||||
|
|
@ -1066,7 +1079,7 @@
|
|||
<record model="ir.actions.act_window" id="open_budget_post_form">
|
||||
<field name="res_model">account.budget.post</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_budget_post_form"/>
|
||||
<field name="view_id" ref="view_budget_post_tree"/>
|
||||
</record>
|
||||
<menuitem name="Financial Management/Configuration/Budgets/Budget items" id="menu_budget_post_form" action="open_budget_post_form"/>
|
||||
|
||||
|
|
@ -1261,7 +1274,7 @@
|
|||
|
||||
<separator string="Subscription Periods" colspan="4"/>
|
||||
<field name="date_start" select="1"/>
|
||||
<field name="period_total" select="1"/>
|
||||
<field name="period_total" select="2"/>
|
||||
|
||||
<field name="period_nbr"/>
|
||||
<field name="period_type"/>
|
||||
|
|
@ -1274,7 +1287,7 @@
|
|||
<field name="lines_id" colspan="4" widget="one2many_list"/>
|
||||
|
||||
<separator string="State" colspan="4"/>
|
||||
<field name="state" select="1"/>
|
||||
<field name="state" select="2"/>
|
||||
<group col="1" colspan="2">
|
||||
<button string="Set to Draft" name="state_draft" type="object" states="done"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
string="Close Fiscal Year"
|
||||
model="account.fiscalyear"
|
||||
name="account.fiscalyear.close"
|
||||
keyword="tree_but_action"
|
||||
menu="False"
|
||||
id="wizard_fiscalyear_close"/>
|
||||
<menuitem
|
||||
name="Financial Management/End of year treatments/Close a fiscal year"
|
||||
|
|
@ -39,17 +39,8 @@
|
|||
string="Close Period"
|
||||
model="account.period"
|
||||
name="account.period.close"
|
||||
keyword="tree_but_action"
|
||||
id="wizard_period_close"/>
|
||||
|
||||
<wizard
|
||||
string="Close Journal"
|
||||
model="account.journal.period"
|
||||
name="account.journal.period.close"
|
||||
keyword="tree_but_action"
|
||||
id="wizard_journal_period_close"
|
||||
auto="False"/>
|
||||
|
||||
<!-- automatic reconcile -->
|
||||
<wizard
|
||||
string="Automatic Reconciliation"
|
||||
|
|
|
|||
|
|
@ -1,23 +1,31 @@
|
|||
<?xml version="1.0"?>
|
||||
<terp>
|
||||
<data noupdate="True">
|
||||
<data fakenoupdate="True">
|
||||
|
||||
<!--
|
||||
Minimal Tiny ERP Account Chart
|
||||
-->
|
||||
|
||||
<record id="minimal_0" model="account.account">
|
||||
<field name="code">0</field>
|
||||
<field name="name">Minimal account chart</field>
|
||||
<field name="close_method">none</field>
|
||||
<field name="parent_id" eval="[]"/>
|
||||
<field name="type">view</field>
|
||||
</record>
|
||||
|
||||
<record model="account.account" id="a_recv">
|
||||
<field name="name">Main Receivable</field>
|
||||
<field name="code">40</field>
|
||||
<field name="type">receivable</field>
|
||||
<field name="parent_id" eval="[(6,0,[])]"/>
|
||||
<field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
</record>
|
||||
<record model="account.account" id="a_pay">
|
||||
<field name="name">Main Payable</field>
|
||||
<field name="code">440</field>
|
||||
<field name="type">payable</field>
|
||||
<field name="parent_id" eval="[(6,0,[])]"/>
|
||||
<field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
</record>
|
||||
|
||||
|
|
@ -25,7 +33,7 @@
|
|||
<field name="name">Petty Cash</field>
|
||||
<field name="code">57</field>
|
||||
<field name="type">cash</field>
|
||||
<field name="parent_id" eval="[(6,0,[])]"/>
|
||||
<field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
</record>
|
||||
|
||||
|
|
@ -33,14 +41,14 @@
|
|||
<field name="name">Products Purchase</field>
|
||||
<field name="code">600</field>
|
||||
<field name="type">expense</field>
|
||||
<field name="parent_id" eval="[(6,0,[])]"/>
|
||||
<field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
</record>
|
||||
<record model="account.account" id="a_sale">
|
||||
<field name="name">Products Sales</field>
|
||||
<field name="code">701</field>
|
||||
<field name="type">income</field>
|
||||
<field name="parent_id" eval="[(6,0,[])]"/>
|
||||
<field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ class account_analytic_account(osv.osv):
|
|||
'active' : fields.boolean('Active'),
|
||||
'type': fields.selection([('view','View'), ('normal','Normal')], 'type'),
|
||||
'description' : fields.text('Description'),
|
||||
'parent_id': fields.many2one('account.analytic.account', 'Parent Cost account', select=True),
|
||||
'parent_id': fields.many2one('account.analytic.account', 'Parent Cost account', select=2),
|
||||
'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Childs Accounts'),
|
||||
'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic entries'),
|
||||
'balance' : fields.function(_balance_calc, method=True, type='float', string='Balance'),
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
<field name="field_parent">child_ids</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Analytic Account" colors="red:date and (date<=current_date); red:quantity_max and (quantity_max>quantity)">
|
||||
<!--<tree string="Analytic Account" colors="red:date and (date<=current_date) or quantity_max and (quantity_max>quantity)">-->
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="partner_id" />
|
||||
|
|
@ -37,6 +36,7 @@
|
|||
<field name="credit" />
|
||||
<field name="balance" />
|
||||
<field name="quantity" />
|
||||
<field name="quantity_max" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -52,12 +52,12 @@
|
|||
<field name="name" select="1"/>
|
||||
<field name="code" select="1"/>
|
||||
<field name="parent_id" on_change="on_change_parent(parent_id)" />
|
||||
<field name="company_id" select="1"/>
|
||||
<field name="company_id" select="2"/>
|
||||
<field name="type" select="1" />
|
||||
<field name="partner_id" select="1" />
|
||||
<field name="partner_id" select="1"/>
|
||||
<newline/>
|
||||
<field name="date_start" />
|
||||
<field name="date" select="1" />
|
||||
<field name="date" select="2"/>
|
||||
<field name="active"/>
|
||||
<newline/>
|
||||
<field name="quantity_max" />
|
||||
|
|
@ -77,9 +77,9 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">account.analytic.account</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_account_analytic_account_form"/>
|
||||
<field name="view_id" ref="view_account_analytic_account_tree"/>
|
||||
</record>
|
||||
<menuitem name="Financial Management/Configuration/Analytic Accounts/Accounts Definition" id="account_analytic_def_account"
|
||||
<menuitem name="Financial Management/Configuration/Analytic Accounts/Analytic Accounts" id="account_analytic_def_account"
|
||||
action="action_account_analytic_account_form"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_account_analytic_account_tree2">
|
||||
|
|
@ -102,17 +102,17 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Analytic Entry">
|
||||
<field name="name" select="1" colspan="4"/>
|
||||
<field name="amount" select="1"/>
|
||||
<field name="amount" select="2"/>
|
||||
<field name="date" select="1"/>
|
||||
<field name="account_id" select="1"/>
|
||||
<field name="journal_id" select="1"/>
|
||||
<field name="general_account_id" select="1"/>
|
||||
<field name="move_id" select="1"/>
|
||||
<field name="unit_amount" select="1"/>
|
||||
<field name="ref" select="1"/>
|
||||
<field name="general_account_id" select="2"/>
|
||||
<field name="move_id" select="2"/>
|
||||
<field name="unit_amount" select="2"/>
|
||||
<field name="ref" select="2"/>
|
||||
<newline/>
|
||||
<field name="product_id" select="1"/>
|
||||
<field name="product_uom_id" select="1"/>
|
||||
<field name="product_id" select="2"/>
|
||||
<field name="product_uom_id" select="2"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -137,9 +137,9 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">account.analytic.line</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_account_analytic_line_form"/>
|
||||
<field name="view_id" ref="view_account_analytic_line_tree"/>
|
||||
</record>
|
||||
<menuitem name="Financial Management/Entries/Analytic account/Entries" id="account_entries_analytic_entries" action="action_account_analytic_line_form" />
|
||||
<menuitem name="Financial Management/Entries/Analytic account/Analytic Entries" id="account_entries_analytic_entries" action="action_account_analytic_line_form" />
|
||||
|
||||
|
||||
<record model="ir.actions.act_window" id="action_account_tree1">
|
||||
|
|
@ -366,10 +366,9 @@
|
|||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="open_account_analytic_budget_post_form">
|
||||
<field name="name">Budget items</field>
|
||||
<field name="res_model">account.analytic.budget.post</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_account_analytic_budget_post_form"/>
|
||||
<field name="view_id" ref="view_account_analytic_budget_post_tree"/>
|
||||
</record>
|
||||
|
||||
<menuitem name="Financial Management/Configuration/Analytic Accounts Budgets/Budget items" id="menu_account_analytic_budget_post_form" action="open_account_analytic_budget_post_form"/>
|
||||
|
|
|
|||
|
|
@ -1,81 +0,0 @@
|
|||
##############################################################################
|
||||
#
|
||||
# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
|
||||
# Fabien Pinckaers <fp@tiny.Be>
|
||||
#
|
||||
# WARNING: This program as such is intended to be used by professional
|
||||
# programmers who take the whole responsability of assessing all potential
|
||||
# consequences resulting from its eventual inadequacies and bugs
|
||||
# End users who are looking for a ready-to-use solution with commercial
|
||||
# garantees and support are strongly adviced to contract a Free Software
|
||||
# Service Company
|
||||
#
|
||||
# This program is Free Software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
import wizard
|
||||
|
||||
_transaction_form = '''<?xml version="1.0"?>
|
||||
<form string="Close Journal">
|
||||
<separator string="Close the journal" colspan="4"/>
|
||||
<field name="debit"/>
|
||||
<field name="credit"/>
|
||||
<field name="count"/>
|
||||
<separator string="Are you sure ?" colspan="4"/>
|
||||
<field name="sur"/>
|
||||
</form>'''
|
||||
|
||||
_transaction_fields = {
|
||||
'credit': {'string':'Credit amount', 'type':'float', 'readonly':True},
|
||||
'debit': {'string':'Debit amount', 'type':'float', 'readonly':True},
|
||||
'count': {'string':'Count', 'type':'float', 'readonly':True},
|
||||
'sur': {'string':'Check this box', 'type':'boolean'},
|
||||
}
|
||||
|
||||
def _data_load(self, cr, uid, data, context):
|
||||
data['form']['credit'] = 0
|
||||
data['form']['debit'] = 0
|
||||
data['form']['count'] = 0
|
||||
for id in data['ids']:
|
||||
cr.execute('select sum(credit), sum(debit), count(*) from account_move_line where journal_id=%d and period_id=%d', result)
|
||||
result = cr.fetchone()
|
||||
data['form']['credit'] += result[0] or 0.0
|
||||
data['form']['debit'] += result[1] or 0.0
|
||||
data['form']['count'] += result[2] or 0.0
|
||||
return data['form']
|
||||
|
||||
def _data_save(self, cr, uid, data, context):
|
||||
if data['form']['sur']:
|
||||
for id in data['ids']:
|
||||
cr.execute('select journal_id,period_id from account_journal_period where id=%d', (id,))
|
||||
result = cr.fetchone()
|
||||
cr.execute('delete from account_move_line where journal_id=%d and period_id=%d and state=\'draft\'', result)
|
||||
cr.execute('update account_journal_period set state=%s where id=%d', ('done', id))
|
||||
return {}
|
||||
|
||||
class wiz_journal_close(wizard.interface):
|
||||
states = {
|
||||
'init': {
|
||||
'actions': [_data_load],
|
||||
'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('close','Close Journal')]}
|
||||
},
|
||||
'close': {
|
||||
'actions': [_data_save],
|
||||
'result': {'type': 'state', 'state':'end'}
|
||||
}
|
||||
}
|
||||
wiz_journal_close('account.journal.period.close')
|
||||
|
||||
|
|
@ -287,7 +287,7 @@
|
|||
<record model="ir.actions.act_window" id="open_view_attendance">
|
||||
<field name="res_model">hr.attendance</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form,tree</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem name="Human Resources/Attendances" id="menu_hr_attendance"/>
|
||||
<menuitem name="Human Resources/Attendances/Attendances" id="menu_open_view_attendance" action="open_view_attendance" groups="admin"/>
|
||||
|
|
@ -340,7 +340,7 @@
|
|||
<record model="ir.actions.act_window" id="open_ask_holidays">
|
||||
<field name="res_model">hr.holidays</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="ask_holiday" />
|
||||
<field name="view_id" ref="view_holiday" />
|
||||
</record>
|
||||
<menuitem name="Human Resources/Attendances/Vacation request"
|
||||
id="menu_open_ask_holidays" action="open_ask_holidays" groups="admin"/>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">hr.analytic.timesheet</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="hr_timesheet_line_form" />
|
||||
<field name="view_id" ref="hr_timesheet_line_tree" />
|
||||
</record>
|
||||
<menuitem name="Human Resources/Hours encoding" id="menu_act_hr_timesheet_line_today_form" action="act_hr_timesheet_line_today_form" />
|
||||
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">hr_timesheet_invoice.factor</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_hr_timesheet_invoice_factor_form"/>
|
||||
<field name="view_id" ref="view_hr_timesheet_invoice_factor_tree"/>
|
||||
</record>
|
||||
<menuitem
|
||||
name="Financial Management/Configuration/Analytic Accounts/Types of invoicing"
|
||||
|
|
|
|||
|
|
@ -88,19 +88,23 @@
|
|||
<notebook>
|
||||
<page string="Workcenter">
|
||||
<separator string="General Information" colspan="4"/>
|
||||
<field name="name" colspan="4" select="1"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="active" select="2"/>
|
||||
<field name="code" select="1"/>
|
||||
<field name="active" select="1"/>
|
||||
<newline/>
|
||||
<field name="type"/>
|
||||
<field name="timesheet_id"/>
|
||||
<field name="note" colspan="4"/>
|
||||
<separator string="Description" colspan="4"/>
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
<separator string="Capacity Information" colspan="4"/>
|
||||
<field name="capacity_per_cycle"/>
|
||||
<newline/>
|
||||
<field name="time_cycle"/>
|
||||
<field name="time_start"/>
|
||||
<field name="time_stop"/>
|
||||
<field name="time_efficiency"/>
|
||||
<group colspan="4" col="4">
|
||||
<field name="capacity_per_cycle"/>
|
||||
<newline/>
|
||||
<field name="time_cycle"/>
|
||||
<field name="time_start"/>
|
||||
<field name="time_stop"/>
|
||||
<field name="time_efficiency"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Cost Accounting">
|
||||
<field name="costs_hour"/>
|
||||
|
|
@ -118,7 +122,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">mrp.workcenter</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="mrp_workcenter_view"/>
|
||||
<field name="view_id" ref="mrp_workcenter_tree_view"/>
|
||||
</record>
|
||||
<menuitem name="Production/Configuration/Workcenters" id="menu_mrp_workcenter_action" action="mrp_workcenter_action"/>
|
||||
|
||||
|
|
@ -164,11 +168,12 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Routing">
|
||||
<separator string="General Information" colspan="4"/>
|
||||
<field name="name" colspan="4" select="1"/>
|
||||
<field name="code" select="1"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="active" select="1"/>
|
||||
<field name="code" select="1"/>
|
||||
<field name="location_id"/>
|
||||
<field name="note" colspan="4"/>
|
||||
<separator string="Description" colspan="4"/>
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
<separator string="Workcenter Operations" colspan="4"/>
|
||||
<field name="workcenter_lines" widget="one2many_list" colspan="4" nolabel="1"/>
|
||||
</form>
|
||||
|
|
@ -182,6 +187,7 @@
|
|||
<tree string="Routing">
|
||||
<field name="code"/>
|
||||
<field name="name"/>
|
||||
<field name="location_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -189,7 +195,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">mrp.routing</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="mrp_routing_form_view"/>
|
||||
<field name="view_id" ref="mrp_routing_tree_view"/>
|
||||
</record>
|
||||
<menuitem name="Production/Configuration/Routings" id="menu_mrp_routing_action" action="mrp_routing_action"/>
|
||||
|
||||
|
|
@ -205,13 +211,12 @@
|
|||
<form string="Bill of Material">
|
||||
<notebook>
|
||||
<page string="General Information">
|
||||
<separator string="General Information" colspan="4"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="code" select="1"/>
|
||||
<field name="product_id" select="1" on_change="onchange_product_id(product_id, name)"/>
|
||||
<field name="product_uom"/>
|
||||
<field name="product_qty"/>
|
||||
<field name="routing_id" select="1"/>
|
||||
<field name="routing_id" select="2"/>
|
||||
<field name="type"/>
|
||||
|
||||
<field name="bom_lines" colspan="4" nolabel="1" widget="one2many_list"/>
|
||||
|
|
@ -220,16 +225,16 @@
|
|||
<field name="revision_ids" colspan="4" nolabel="1" widget="one2many_list"/>
|
||||
</page>
|
||||
<page string="Properties">
|
||||
<field name="position" select="1" />
|
||||
<field name="active" select="1"/>
|
||||
<field name="position" select="2" />
|
||||
<field name="active" select="2"/>
|
||||
<field name="sequence"/>
|
||||
<field name="bom_id"/>
|
||||
|
||||
<field name="date_start" select="1"/>
|
||||
<field name="date_stop" select="1"/>
|
||||
<field name="date_start" select="2"/>
|
||||
<field name="date_stop" select="2"/>
|
||||
<field name="product_rounding"/>
|
||||
<field name="product_efficiency"/>
|
||||
<field name="property_ids" colspan="4" nolabel="1"/>
|
||||
<field name="property_ids" colspan="4" nolabel="2"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
|
|
@ -257,7 +262,7 @@
|
|||
<field name="res_model">mrp.bom</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="domain">[('bom_id','=',False)]</field>
|
||||
<field name="view_id" ref="mrp_bom_form_view"/>
|
||||
<field name="view_id" ref="mrp_bom_tree_view"/>
|
||||
</record>
|
||||
<menuitem name="Production/Configuration/Bill of Materials" id="menu_mrp_bom_form_action" action="mrp_bom_form_action"/>
|
||||
|
||||
|
|
@ -274,7 +279,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">mrp.bom</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="mrp_bom_form_view"/>
|
||||
<field name="view_id" ref="mrp_bom_tree_view"/>
|
||||
</record>
|
||||
<menuitem name="Production/Configuration/Bill of Materials/BoMs Components" id="menu_mrp_bom_form_action2" action="mrp_bom_form_action2"/>
|
||||
|
||||
|
|
@ -361,15 +366,15 @@
|
|||
<field name="product_id" on_change="product_id_change(product_id)" select="1"/>
|
||||
<field name="product_qty"/>
|
||||
<field name="product_uom"/>
|
||||
<field name="bom_id" select="1"/>
|
||||
<field name="bom_id" select="2"/>
|
||||
|
||||
<newline/>
|
||||
<field name="location_src_id" select="1"/>
|
||||
<field name="location_src_id" select="2"/>
|
||||
<field name="location_dest_id"/>
|
||||
|
||||
<field name="move_lines" colspan="4" nolabel="1" widget="one2many_list"/>
|
||||
<field name="state" select="1"/>
|
||||
<group colspan="2" col="7">
|
||||
<group colspan="4" col="9">
|
||||
<field name="state" select="2"/>
|
||||
<button name="action_compute" string="Compute Data" states="draft" type="object"/>
|
||||
<button name="button_confirm" string="Confirm Production" states="draft"/>
|
||||
<button name="button_produce" string="Start Production" states="ready"/>
|
||||
|
|
@ -383,7 +388,7 @@
|
|||
</page><page string="Workcenters">
|
||||
<field name="workcenter_lines" colspan="4" nolabel="1" widget="one2many_list"/>
|
||||
</page><page string="Others Info">
|
||||
<field name="date_start" select="1"/>
|
||||
<field name="date_start" select="2"/>
|
||||
<field name="date_finnished"/>
|
||||
<field name="picking_id"/>
|
||||
<field name="origin"/>
|
||||
|
|
@ -548,23 +553,22 @@
|
|||
<field name="name" colspan="4" select="1"/>
|
||||
<field name="priority"/>
|
||||
<field name="date_planned" select="1"/>
|
||||
<field name="procure_method" select="1"/>
|
||||
<field name="date_close" select="1"/>
|
||||
<field name="procure_method" select="2"/>
|
||||
<field name="date_close" select="2"/>
|
||||
<newline/>
|
||||
<field name="product_qty"/>
|
||||
<field name="product_uom"/>
|
||||
<field name="product_id" select="1"/>
|
||||
<field name="location_id" select="1"/>
|
||||
<field name="location_id" select="2"/>
|
||||
<newline/>
|
||||
<field name="origin" select="1"/>
|
||||
<field name="origin" select="2"/>
|
||||
<field name="move_id"/>
|
||||
<newline/>
|
||||
<field name="message" colspan="4"/>
|
||||
<separator string="Properties" colspan="4"/>
|
||||
<field name="property_ids" colspan="4"/>
|
||||
<separator string="Document State" colspan="4"/>
|
||||
<field name="state" readonly="1" select="1"/>
|
||||
<group col="5" colspan="2">
|
||||
<field name="property_ids" colspan="4" nolabel="1"/>
|
||||
<group col="7" colspan="4">
|
||||
<field name="state" readonly="1" select="2"/>
|
||||
<button string="Confirm" name="button_confirm" states="draft"/>
|
||||
<button string="Retry" name="button_restart" states="exception"/>
|
||||
<button string="Cancel" name="button_cancel" states="exception"/>
|
||||
|
|
@ -664,10 +668,10 @@
|
|||
<field name="res_model">stock.warehouse.orderpoint</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_warehouse_orderpoint_form"/>
|
||||
<field name="view_id" ref="view_warehouse_orderpoint_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Reordering Policy" sequence="4"/>
|
||||
<menuitem name="Inventory Control/Reordering Policy/Order Point" id="menu_action_orderpoint_form" action="action_orderpoint_form"/>
|
||||
<menuitem name="Inventory Control/Ordering Policy" sequence="4"/>
|
||||
<menuitem name="Inventory Control/Ordering Policy/Order Point" id="menu_action_orderpoint_form" action="action_orderpoint_form"/>
|
||||
|
||||
<act_window name="Orderpoint"
|
||||
domain="[('warehouse_id', '=', active_id)]"
|
||||
|
|
|
|||
|
|
@ -11,19 +11,33 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Pricelist Version">
|
||||
<field name="name" select="1"/>
|
||||
<field name="active" select="1"/>
|
||||
<field name="pricelist_id" colspan="4"/>
|
||||
<field name="active" select="2"/>
|
||||
<field name="pricelist_id" colspan="4" select="1"/>
|
||||
<field name="date_start" select="1"/>
|
||||
<field name="date_end" select="1"/>
|
||||
<field name="items_id" colspan="4" nolabel="1" widget="one2many_list"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="product_pricelist_version_tree_view">
|
||||
<field name="name">product.pricelist.version.tree</field>
|
||||
<field name="model">product.pricelist.version</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Pricelist Version">
|
||||
<field name="name"/>
|
||||
<field name="pricelist_id"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="product_pricelist_action">
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.pricelist.version</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="product_pricelist_version_form_view"/>
|
||||
<field name="view_id" ref="product_pricelist_version_tree_view"/>
|
||||
</record>
|
||||
<menuitem name="Products/Pricelists/Pricelists Version" id="menu_product_pricelist_action" action="product_pricelist_action"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -34,31 +34,31 @@
|
|||
<page string="Information">
|
||||
<field name="name" select="1"/>
|
||||
<field name="default_code" select="1"/>
|
||||
<field name="variants" select="1"/>
|
||||
<field name="ean13" select="1"/>
|
||||
<field name="variants" select="2"/>
|
||||
<field name="ean13" select="2"/>
|
||||
<newline/>
|
||||
<field name="categ_id" select="1"/>
|
||||
<field name="type" select="1"/>
|
||||
<field name="type" select="2"/>
|
||||
<field name="volume" digits="(14, 3)"/>
|
||||
<newline/>
|
||||
<field name="weight" digits="(14, 3)"/>
|
||||
<field name="weight_net" digits="(14, 3)"/>
|
||||
<field name="procure_method" select="1"/>
|
||||
<field name="procure_method" select="2"/>
|
||||
<field name="state"/>
|
||||
<field name="uom_id"/>
|
||||
<field name="uom_po_id"/>
|
||||
<field name="product_manager"/>
|
||||
</page>
|
||||
<page string="Procurement (days)">
|
||||
<field name="supply_method" select="1"/>
|
||||
<field name="active" select="1"/>
|
||||
<field name="supply_method" select="2"/>
|
||||
<field name="active" select="2"/>
|
||||
<newline/>
|
||||
<field name="sale_delay" select="1"/>
|
||||
<field name="sale_ok" select="1"/>
|
||||
<field name="produce_delay" select="1"/>
|
||||
<field name="purchase_ok" select="1"/>
|
||||
<field name="sale_delay" select="2"/>
|
||||
<field name="sale_ok" select="2"/>
|
||||
<field name="produce_delay" select="2"/>
|
||||
<field name="purchase_ok" select="2"/>
|
||||
<field name="warranty"/>
|
||||
<field name="rental" select="1"/>
|
||||
<field name="rental" select="2"/>
|
||||
<field name="list_price"/>
|
||||
<newline/>
|
||||
<field name="standard_price"/>
|
||||
|
|
@ -96,23 +96,12 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.product</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="product_normal_form_view"/>
|
||||
<field name="view_id" ref="product_product_tree_view"/>
|
||||
</record>
|
||||
|
||||
<menuitem name="Products" groups="admin"/>
|
||||
<menuitem name="Products/Products" action="product_normal_action" id="menu_products"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="product_normal_action_list">
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.product</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="product_normal_form_view"/>
|
||||
</record>
|
||||
<menuitem name="Products/Products/Products list" action="product_normal_action_list" id="menu_products_list"/>
|
||||
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="product_variant_form_view">
|
||||
<field name="name">product.variant.form</field>
|
||||
<field name="model">product.product</field>
|
||||
|
|
@ -133,10 +122,35 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.product</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="product_variant_action_view1">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="product_product_tree_view"/>
|
||||
<field name="act_window_id" ref="product_variant_action"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="product_variant_action_view2">
|
||||
<field name="sequence" eval="20"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="product_variant_form_view"/>
|
||||
<field name="act_window_id" ref="product_variant_action"/>
|
||||
</record>
|
||||
<menuitem name="Products/Products/Variants" id="menu_product_variant_action" action="product_variant_action"/>
|
||||
|
||||
<record model="ir.ui.view" id="product_template_tree_view">
|
||||
<field name="name">product.template.product.tree</field>
|
||||
<field name="model">product.template</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Product Template">
|
||||
<field name="name"/>
|
||||
<field name="categ_id"/>
|
||||
<field name="type"/>
|
||||
<field name="state" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="product_template_form_view">
|
||||
<field name="name">product.template.product.form</field>
|
||||
<field name="model">product.template</field>
|
||||
|
|
@ -163,13 +177,13 @@
|
|||
<field name="product_manager"/>
|
||||
<field name="cost_method"/>
|
||||
</page><page string="Procurement (days)">
|
||||
<field name="supply_method" select="1"/>
|
||||
<field name="rental" select="1"/>
|
||||
<field name="supply_method" select="2"/>
|
||||
<field name="rental" select="2"/>
|
||||
<newline/>
|
||||
<field name="sale_delay" select="1"/>
|
||||
<field name="sale_ok" select="1"/>
|
||||
<field name="purchase_ok" select="1"/>
|
||||
<field name="produce_delay" select="1"/>
|
||||
<field name="sale_delay" select="2"/>
|
||||
<field name="sale_ok" select="2"/>
|
||||
<field name="purchase_ok" select="2"/>
|
||||
<field name="produce_delay" select="2"/>
|
||||
<field name="warranty"/>
|
||||
</page><page string="Descriptions">
|
||||
<separator string="Sale Description"/>
|
||||
|
|
@ -188,7 +202,18 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.template</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="product_template_action_view1">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="product_template_tree_view"/>
|
||||
<field name="act_window_id" ref="product_template_action"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="product_template_action_view2">
|
||||
<field name="sequence" eval="20"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="product_template_form_view"/>
|
||||
<field name="act_window_id" ref="product_template_action"/>
|
||||
</record>
|
||||
<menuitem name="Products/Products/Templates" id="menu_product_template_action" action="product_template_action" groups="admin"/>
|
||||
|
||||
|
|
@ -229,7 +254,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.category</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="product_category_form_view"/>
|
||||
<field name="view_id" ref="product_category_tree_view"/>
|
||||
</record>
|
||||
<menuitem name="Products/Configuration/Products categories" id="menu_product_category_action_form" action="product_category_action_form"/>
|
||||
|
||||
|
|
@ -287,7 +312,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.uom</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="product_uom_form_view"/>
|
||||
<field name="view_id" ref="product_uom_tree_view"/>
|
||||
</record>
|
||||
<menuitem name="Products/Configuration/Unit of Measure/Unit of Measure" id="menu_product_uom_form_action" action="product_uom_form_action"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<page string="Administration">
|
||||
<field name="name" select="1" />
|
||||
<group colspan="2" col="3">
|
||||
<field name="active" select="1" />
|
||||
<field name="active" select="2"/>
|
||||
<button string="Toggle activity" name="toggleActive" type="object" />
|
||||
</group>
|
||||
<field name="manager" select="1"/>
|
||||
|
|
@ -33,8 +33,8 @@
|
|||
</page>
|
||||
<page string="Partner Info">
|
||||
<field name="partner_id" select="1" colspan="4" on_change="onchange_partner_id(partner_id)"/>
|
||||
<field name="contact_id" select="1" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="category_id"/>
|
||||
<field name="contact_id" select="2" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="category_id" select="2"/>
|
||||
<field name="pricelist_id"/>
|
||||
<field name="warn_customer"/>
|
||||
<field name="mode"/>
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
<label string="Date Stop: %%(date_stop)s"/>
|
||||
</group>
|
||||
<separator string="Taxes" colspan="4" />
|
||||
<field name="tax_ids" colspan="4"/>
|
||||
<field name="tax_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Tasks">
|
||||
<field name="tasks" nolabel="1" colspan="4" widget="one2many_list">
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
<field name="res_model">project.project</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="domain"></field>
|
||||
<field name="view_id" ref="edit_project" />
|
||||
<field name="view_id" ref="view_project" />
|
||||
</record>
|
||||
<menuitem name="Project/All Projects/Edit project" id="menu_open_view_project" action="open_view_project"/>
|
||||
|
||||
|
|
@ -215,8 +215,8 @@
|
|||
<field name="name" select="1"/>
|
||||
<field name="project_id" required="1" select="1"/>
|
||||
<field name="user_id" select="1"/>
|
||||
<field name="priority" select="1"/>
|
||||
<field name="date_deadline" select="1"/>
|
||||
<field name="priority" select="2"/>
|
||||
<field name="date_deadline" select="2"/>
|
||||
<field name="planned_hours"/>
|
||||
<separator colspan="4" string="Description"/>
|
||||
<field colspan="4" name="description" nolabel="1"/>
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
<field colspan="4" name="work_ids" nolabel="1"/>
|
||||
<newline/>
|
||||
<group col="11" colspan="4">
|
||||
<field name="state" select="1"/>
|
||||
<field name="state" select="2"/>
|
||||
<button name="do_draft" string="Set to draft" states="open" type="object"/>
|
||||
<button name="do_open" string="Open task" states="pending,draft" type="object"/>
|
||||
<button name="do_reopen" string="Re-open" states="done,cancelled" type="object"/>
|
||||
|
|
@ -236,16 +236,16 @@
|
|||
</group>
|
||||
</page>
|
||||
<page string="Other Information">
|
||||
<field name="date_start" select="1"/>
|
||||
<field name="date_close" select="1"/>
|
||||
<field name="date_start" select="2"/>
|
||||
<field name="date_close" select="2"/>
|
||||
<field name="type"/>
|
||||
<field name="sequence"/>
|
||||
<field name="active" select="1"/>
|
||||
<field name="active" select="2"/>
|
||||
<field name="start_sequence"/>
|
||||
<field name="partner_id" select="1"/>
|
||||
<field name="partner_id" select="2"/>
|
||||
<newline/>
|
||||
<field name="invoice_id"/>
|
||||
<field name="billable" select="1"/>
|
||||
<field name="billable" select="2"/>
|
||||
<separator colspan="4" string="Notes"/>
|
||||
<field colspan="4" name="notes" nolabel="1"/>
|
||||
<separator colspan="4" string="Customer Description"/>
|
||||
|
|
@ -261,7 +261,7 @@
|
|||
<field name="type">tree</field>
|
||||
<field name="priority" eval="2"/>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="All tasks" colors="red:date_deadline<current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state=='cancel'">
|
||||
<tree string="Tasks" colors="red:date_deadline<current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state=='cancel'">
|
||||
<field name="sequence"/>
|
||||
<field name="name"/>
|
||||
<field name="project_id"/>
|
||||
|
|
@ -277,8 +277,7 @@
|
|||
<record model="ir.actions.act_window" id="action_view_task">
|
||||
<field name="res_model">project.task</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="domain">[]</field>
|
||||
<field name="view_id" ref="view_task_form2" />
|
||||
<field name="view_id" ref="view_task_tree2" />
|
||||
</record>
|
||||
<menuitem name="Project/All Tasks" id="menu_action_view_task" action="action_view_task" />
|
||||
|
||||
|
|
@ -382,10 +381,20 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="task_type_tree">
|
||||
<field name="name">project.task.type.tree</field>
|
||||
<field name="model">project.task.type</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Task type">
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="open_task_type_form">
|
||||
<field name="res_model">project.task.type</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="task_type_edit"/>
|
||||
<field name="view_id" ref="task_type_tree"/>
|
||||
</record>
|
||||
<menuitem name="Project/Configuration/Task types" id="menu_task_types" action="open_task_type_form"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -14,20 +14,20 @@
|
|||
<page string="Purchase Order">
|
||||
<field name="name" select="1"/>
|
||||
<group colspan="2" col="4">
|
||||
<field name="shipped" select="1"/>
|
||||
<field name="invoiced" select="1"/>
|
||||
<field name="shipped" select="2"/>
|
||||
<field name="invoiced" select="2"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)"/>
|
||||
<field name="date_order" select="1"/>
|
||||
<field name="date_order" select="2"/>
|
||||
<field name="partner_id" select="1" on_change="onchange_partner_id(partner_id)"/>
|
||||
<field name="partner_address_id"/>
|
||||
<field name="pricelist_id" domain="[('type','=','purchase')]"/>
|
||||
<field name="ref" select="1"/>
|
||||
<field name="partner_ref" select="1"/>
|
||||
<field name="partner_ref" select="2"/>
|
||||
<newline/>
|
||||
<field name="order_line" widget="one2many_list" colspan="4" nolabel="1"/>
|
||||
<separator string="Document State" colspan="4" select="1"/>
|
||||
<separator string="Document State" colspan="4" select="2"/>
|
||||
<group colspan="4" col="7">
|
||||
<field name="amount_untaxed"/>
|
||||
<field name="amount_tax"/>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
<page string="Notes">
|
||||
<field name="validator" />
|
||||
<field name="date_approve" />
|
||||
<field name="origin" select="1"/>
|
||||
<field name="origin" select="2"/>
|
||||
<field name="notes" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem name="Purchase Management/Purchase Order/Draft Purchase Order (RFQ)" action="purchase_form_action2" id="menu_purchase_order_draft"/>
|
||||
<menuitem name="Purchase Management/Purchase Order/Draft Purchase Order" action="purchase_form_action2" id="menu_purchase_order_draft"/>
|
||||
<record model="ir.actions.act_window" id="purchase_form_action3">
|
||||
<field name="name">Purchase Order waiting Approval</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@
|
|||
|
||||
|
||||
<record model="ir.actions.act_window" id="action_account_analytic_line_to_invoice">
|
||||
<field name="name">report.account.analytic.line.tree</field>
|
||||
<field name="res_model">report.account.analytic.line.to.invoice</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
|
|
|
|||
|
|
@ -10,22 +10,35 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Sale Shop">
|
||||
<field name="name" select="1"/>
|
||||
<newline/>
|
||||
<field name="warehouse_id" select="1" required="1"/>
|
||||
<separator string="Accounting" colspan="4"/>
|
||||
<field name="pricelist_id" domain="[('type','=','sale')]" colspan="4" select="1"/>
|
||||
<field name="project_id" colspan="4" select="1"/>
|
||||
<field name="payment_default_id" colspan="4"/>
|
||||
<field name="payment_account_id" colspan="4"/>
|
||||
<separator string="Stock" colspan="4"/>
|
||||
<field name="warehouse_id" colspan="4" select="1" required="1"/>
|
||||
<field name="payment_default_id"/>
|
||||
<field name="pricelist_id" domain="[('type','=','sale')]" select="1"/>
|
||||
<field name="project_id" select="1"/>
|
||||
<separator string="Payment accounts" colspan="4"/>
|
||||
<field name="payment_account_id" colspan="4" nolabel="1"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_shop_tree">
|
||||
<field name="name">sale.shop</field>
|
||||
<field name="model">sale.shop</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Sale Shop">
|
||||
<field name="name"/>
|
||||
<field name="pricelist_id"/>
|
||||
<field name="project_id"/>
|
||||
<field name="warehouse_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_shop_form">
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">sale.shop</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_shop_form"/>
|
||||
<field name="view_id" ref="view_shop_tree"/>
|
||||
</record>
|
||||
<menuitem name="Sales Management/Configuration" groups="admin" sequence="1"/>
|
||||
<menuitem name="Sales Management/Configuration/Shop" id="menu_action_shop_form" action="action_shop_form"/>
|
||||
|
|
@ -58,67 +71,70 @@
|
|||
<page string="Sale Order">
|
||||
<field name="name" select="1"/>
|
||||
<group colspan="2" col="4">
|
||||
<field name="shipped" select="1"/>
|
||||
<field name="invoiced" select="1"/>
|
||||
<field name="shipped" select="2"/>
|
||||
<field name="invoiced" select="2"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<field name="date_order" select="1"/>
|
||||
<field name="shop_id" select="1" on_change="onchange_shop_id(shop_id)"/>
|
||||
<field name="shop_id" select="2" on_change="onchange_shop_id(shop_id)"/>
|
||||
<field name="partner_id" select="1" on_change="onchange_partner_id(partner_id)" required="1"/>
|
||||
<field name="partner_order_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="partner_invoice_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="partner_shipping_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="pricelist_id" domain="[('type','=','sale')]"/>
|
||||
<field name="project_id" select="1"/>
|
||||
<field name="project_id" select="2"/>
|
||||
<newline/>
|
||||
<field name="order_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
|
||||
<form string="Sale Order Lines">
|
||||
<notebook>
|
||||
<page string="Order Line">
|
||||
<separator string="Automatic Declaration" colspan="4"/>
|
||||
<field name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False)" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" select="1"/>
|
||||
<field name="product_uom"/>
|
||||
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True)" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" colspan="4" select="1"/>
|
||||
|
||||
<separator string="Manual Description" colspan="4"/>
|
||||
<field name="name" colspan="4" select="1"/>
|
||||
<field name="price_unit" select="1"/>
|
||||
<field name="discount"/>
|
||||
<field name="type"/>
|
||||
<field name="delay" select="1"/>
|
||||
<newline/>
|
||||
<field name="tax_id" colspan="4"/>
|
||||
<separator string="States" colspan="4"/>
|
||||
<field name="state" select="1"/>
|
||||
<field name="invoiced" select="1"/>
|
||||
</page><page string="Extra Info">
|
||||
<field name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
|
||||
<field name="product_uos" />
|
||||
<field name="product_packaging" />
|
||||
<field name="address_allotment_id" select="1"/>
|
||||
<separator string="Properties" colspan="4"/>
|
||||
<field name="property_ids" colspan="4" nolabel="1"/>
|
||||
</page><page string="Notes">
|
||||
<field name="notes" colspan="4" nolabel="1"/>
|
||||
</page><page string="History">
|
||||
<separator string="Invoice Lines" colspan="4"/>
|
||||
<field name="invoice_lines" colspan="4" nolabel="1"/>
|
||||
<separator string="Inventory Moves" colspan="4"/>
|
||||
<field name="move_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
<tree string="Sales Order Lines">
|
||||
<field name="name" colspan="4"/>
|
||||
<field name="product_id"/>
|
||||
<field name="product_uom_qty" string="Qty"/>
|
||||
<field name="product_uom" string="UoM"/>
|
||||
<field name="discount"/>
|
||||
<field name="price_unit"/>
|
||||
<field name="price_net"/>
|
||||
<field name="price_subtotal"/>
|
||||
</tree>
|
||||
</field>
|
||||
<form string="Sale Order Lines">
|
||||
<notebook>
|
||||
<page string="Order Line">
|
||||
<separator string="Automatic Declaration" colspan="4"/>
|
||||
<field name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False)" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" select="1"/>
|
||||
<field name="product_uom"/>
|
||||
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True)" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" colspan="4" select="1"/>
|
||||
|
||||
<separator string="Manual Description" colspan="4"/>
|
||||
<field name="name" colspan="4" select="2"/>
|
||||
<field name="price_unit" select="2"/>
|
||||
<field name="discount"/>
|
||||
<field name="type"/>
|
||||
<field name="delay" select="2"/>
|
||||
<newline/>
|
||||
<field name="tax_id" colspan="4"/>
|
||||
<separator string="States" colspan="4"/>
|
||||
<field name="state" select="2"/>
|
||||
<field name="invoiced" select="2"/>
|
||||
</page>
|
||||
<page string="Extra Info">
|
||||
<field name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
|
||||
<field name="product_uos" />
|
||||
<field name="product_packaging" />
|
||||
<field name="address_allotment_id" select="2"/>
|
||||
<separator string="Properties" colspan="4"/>
|
||||
<field name="property_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Notes">
|
||||
<field name="notes" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="History">
|
||||
<separator string="Invoice Lines" colspan="4"/>
|
||||
<field name="invoice_lines" colspan="4" nolabel="1"/>
|
||||
<separator string="Inventory Moves" colspan="4"/>
|
||||
<field name="move_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
<tree string="Sales Order Lines">
|
||||
<field name="name" colspan="4"/>
|
||||
<field name="product_id"/>
|
||||
<field name="product_uom_qty" string="Qty"/>
|
||||
<field name="product_uom" string="UoM"/>
|
||||
<field name="discount"/>
|
||||
<field name="price_unit"/>
|
||||
<field name="price_net"/>
|
||||
<field name="price_subtotal"/>
|
||||
</tree>
|
||||
</field>
|
||||
<newline/>
|
||||
<group colspan="4" col="7">
|
||||
<field name="amount_untaxed"/>
|
||||
|
|
@ -127,7 +143,7 @@
|
|||
<button name="button_dummy" string="Compute" states="draft" type="object"/>
|
||||
</group>
|
||||
<group colspan="4" col="13">
|
||||
<field name="state" select="1"/>
|
||||
<field name="state" select="2"/>
|
||||
<button name="order_confirm" string="Confirm Order" states="draft"/>
|
||||
<button name="invoice_recreate" string="Recreate Invoice" states="invoice_except"/>
|
||||
<button name="invoice_corrected" string="Invoice Corrected" states="invoice_except"/>
|
||||
|
|
@ -151,7 +167,8 @@
|
|||
<field name="client_order_ref" />
|
||||
<separator string="Notes" colspan="4"/>
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
</page><page string="History">
|
||||
</page>
|
||||
<page string="History">
|
||||
<separator string="Generated Invoices" colspan="4"/>
|
||||
<field name="invoice_ids" colspan="4" nolabel="1"/>
|
||||
<separator string="Generated Pickings" colspan="4"/>
|
||||
|
|
@ -274,65 +291,6 @@
|
|||
<menuitem name="Sales Management/Sales Order/My Sales Order/Requests For Quotation" id="menu_action_order_tree10" action="action_order_tree10"/>
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="view_order_pos_form">
|
||||
<field name="name">sale.order.pos</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="type">form</field>
|
||||
<field name="priority" eval="32"/>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Sales Order POS">
|
||||
<notebook>
|
||||
<page string="Order Line">
|
||||
<field name="order_line" widget="one2many_list" colspan="4" nolabel="1"/>
|
||||
<group colspan="4" col="7">
|
||||
<field name="amount_untaxed"/>
|
||||
<field name="amount_tax"/>
|
||||
<field name="amount_total"/>
|
||||
<button name="button_dummy" string="Compute" states="draft" type="object"/>
|
||||
</group>
|
||||
<field name="state" select="1"/>
|
||||
<group colspan="2" col="3">
|
||||
<button name="action_direct_sale" string="Direct Sale" states="draft" type="object"/>
|
||||
<button name="cancel" string="Cancel Sale" states="draft"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Notes">
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Advanced">
|
||||
<separator string="Shop" colspan="4"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="shop_id" select="1" on_change="onchange_shop_id(shop_id)"/>
|
||||
<field name="date_order" select="1"/>
|
||||
<group colspan="2" col="4">
|
||||
<field name="shipped" select="1"/>
|
||||
<field name="invoiced" select="1"/>
|
||||
</group>
|
||||
<separator string="Order type" colspan="4"/>
|
||||
<field name="order_policy" />
|
||||
<field name="pricelist_id" />
|
||||
<field name="project_id" select="1"/>
|
||||
<separator string="Partner" colspan="4"/>
|
||||
<field name="partner_id" select="1" on_change="onchange_partner_id(partner_id)"/>
|
||||
<field name="partner_order_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="partner_invoice_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="partner_shipping_id" domain="[('partner_id','=',partner_id)]"/>
|
||||
<separator string="Links" colspan="4"/>
|
||||
<field name="invoice_ids" select="1" colspan="4"/>
|
||||
<field name="picking_ids" colspan="4"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_order_pos_form">
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">sale.order</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_order_pos_form"/>
|
||||
</record>
|
||||
<!-- <menuitem name="Sales Management/Order POS" action="action_order_pos_form"/> -->
|
||||
|
||||
<record model="ir.ui.view" id="view_order_line_graph">
|
||||
<field name="name">sale.order.line.graph</field>
|
||||
<field name="model">sale.order.line</field>
|
||||
|
|
@ -372,35 +330,37 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Sales Order Lines">
|
||||
<notebook>
|
||||
<page string="Order Lines">
|
||||
<separator string="Automatic Declaration" colspan="4"/>
|
||||
<field name="order_id" select="1"/>
|
||||
<field name="invoiced" select="1"/>
|
||||
<field name="product_uom_qty" readonly="1" select="1"/>
|
||||
<field name="product_uom" readonly="1"/>
|
||||
<field name="product_id" readonly="1" select="1"/>
|
||||
|
||||
<separator string="Manual Designation" colspan="4"/>
|
||||
<field name="name" colspan="4" select="1"/>
|
||||
<field name="price_unit" select="1"/>
|
||||
<field name="discount"/>
|
||||
<field name="type"/>
|
||||
<field name="delay" select="1"/>
|
||||
<field name="price_subtotal"/>
|
||||
<field name="tax_id" colspan="4"/>
|
||||
<separator string="States" colspan="4"/>
|
||||
<field name="state" select="1"/>
|
||||
<group colspan="2" col="2">
|
||||
<button string="Done" name="button_done" type="object" states="confirmed"/>
|
||||
|
||||
</group>
|
||||
</page><page string="Properties">
|
||||
<field name="property_ids"/>
|
||||
</page><page string="Notes">
|
||||
<field name="notes" colspan="4" nolabel="1"/>
|
||||
</page><page string="Invoice Lines">
|
||||
<field name="invoice_lines" colspan="4"/>
|
||||
</page>
|
||||
<page string="Order Lines">
|
||||
<separator string="Automatic Declaration" colspan="4"/>
|
||||
<field name="order_id" select="1"/>
|
||||
<field name="invoiced" select="1"/>
|
||||
<field name="product_uom_qty" readonly="1" select="2"/>
|
||||
<field name="product_uom" readonly="2"/>
|
||||
<field name="product_id" readonly="1" select="1"/>
|
||||
|
||||
<separator string="Manual Designation" colspan="4"/>
|
||||
<field name="name" colspan="4" select="2"/>
|
||||
<field name="price_unit" select="2"/>
|
||||
<field name="discount"/>
|
||||
<field name="type"/>
|
||||
<field name="delay" select="2"/>
|
||||
<field name="price_subtotal"/>
|
||||
<field name="tax_id" colspan="4"/>
|
||||
<separator string="States" colspan="4"/>
|
||||
<field name="state" select="2"/>
|
||||
<group colspan="2" col="2">
|
||||
<button string="Done" name="button_done" type="object" states="confirmed"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Properties">
|
||||
<field name="property_ids" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Notes">
|
||||
<field name="notes" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Invoice Lines">
|
||||
<field name="invoice_lines" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.inventory</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_inventory_form"/>
|
||||
<field name="view_id" ref="view_inventory_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Lot Inventory" id="menu_action_inventory_form" action="action_inventory_form"/>
|
||||
|
||||
|
|
@ -88,25 +88,13 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="stock_inventory_line_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Lot Inventory Line" id="menu_action_inventory_line_form" action="action_inventory_line_form"/>
|
||||
<menuitem name="Inventory Control/Lot Inventory/Lot Inventory Line" id="menu_action_inventory_line_form" action="action_inventory_line_form"/>
|
||||
|
||||
|
||||
=============================
|
||||
Lot
|
||||
=============================
|
||||
|
||||
<record model="ir.ui.view" id="prodlot_form">
|
||||
<field name="name">stock.production.lot.form</field>
|
||||
<field name="model">stock.production.lot</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Lot">
|
||||
<field name="name" select="1"/>
|
||||
<field name="ref"/>
|
||||
<field name="date" />
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_tracking_form">
|
||||
<field name="name">stock.tracking.form</field>
|
||||
<field name="model">stock.tracking</field>
|
||||
|
|
@ -120,14 +108,27 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_tracking_tree">
|
||||
<field name="name">stock.tracking.tree</field>
|
||||
<field name="model">stock.tracking</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Tracking/Serial">
|
||||
<field name="name"/>
|
||||
<field name="serial"/>
|
||||
<field name="date"/>
|
||||
<field name="active"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_tracking_form">
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.tracking</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_tracking_form"/>
|
||||
<field name="view_id" ref="view_tracking_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability" sequence="2"/>
|
||||
<menuitem name="Inventory Control/Traceability/Tracking Numbers" id="menu_action_tracking_form" action="action_tracking_form"/>
|
||||
<menuitem name="Inventory Control/Traceability/Tracking Serial " id="menu_action_tracking_form" action="action_tracking_form"/>
|
||||
|
||||
<record model="ir.ui.view" id="lot_line_tree">
|
||||
<field name="name">stock.tracking.tree</field>
|
||||
|
|
@ -173,7 +174,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.lot</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_lot_form"/>
|
||||
<field name="view_id" ref="view_lot_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Consumer lots" id="menu_action_lot_form" action="action_lot_form"/>
|
||||
|
||||
|
|
@ -213,17 +214,30 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Production Lot">
|
||||
<field name="name" select="1"/>
|
||||
<field name="ref"/>
|
||||
<field name="ref" select="1"/>
|
||||
<field name="date" select="1"/>
|
||||
<field name="revisions" colspan="4" widget="one2many_list"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_production_lot_tree">
|
||||
<field name="name">stock.production.lot.tree</field>
|
||||
<field name="model">stock.production.lot</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Production Lot">
|
||||
<field name="name"/>
|
||||
<field name="ref"/>
|
||||
<field name="date"/>
|
||||
<field name="revisions"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_production_lot_form">
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.production.lot</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_production_lot_form"/>
|
||||
<field name="view_id" ref="view_production_lot_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Production lots" id="menu_action_production_lot_form" action="action_production_lot_form"/>
|
||||
|
||||
|
|
@ -330,7 +344,7 @@
|
|||
<notebook>
|
||||
<page string="General Informations">
|
||||
<field name="name" select="1"/>
|
||||
<field name="active" select="1"/>
|
||||
<field name="active" select="2"/>
|
||||
<field name="usage" select="1"/>
|
||||
<field name="account_id" select="1"/>
|
||||
<field name="location_id"/>
|
||||
|
|
@ -346,13 +360,27 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_location_tree2">
|
||||
<field name="name">stock.location.tree</field>
|
||||
<field name="model">stock.location</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Stock Location">
|
||||
<field name="name"/>
|
||||
<field name="usage"/>
|
||||
<field name="account_id"/>
|
||||
<field name="active"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_location_form">
|
||||
<field name="res_model">stock.location</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_location_form"/>
|
||||
<field name="view_id" ref="view_location_tree2"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Configuration/Location" id="menu_action_location_form" action="action_location_form"/>
|
||||
<menuitem name="Inventory Control/Configuration/Stock Location" id="menu_action_location_form" action="action_location_form"/>
|
||||
|
||||
<record model="ir.ui.view" id="view_location_tree">
|
||||
<field name="name">stock.location.tree</field>
|
||||
|
|
@ -381,9 +409,8 @@
|
|||
<field name="name">stock.warehouse</field>
|
||||
<field name="model">stock.warehouse</field>
|
||||
<field name="type">form</field>
|
||||
<!-- <field name="parent_field">child_id</field> -->
|
||||
<field name="arch" type="xml">
|
||||
<form string="Stock Warehouse">
|
||||
<form string="Warehouse">
|
||||
<field name="name" select="1" colspan="4"/>
|
||||
<field name="lot_input_id"/>
|
||||
<field name="lot_stock_id"/>
|
||||
|
|
@ -393,11 +420,25 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_warehouse_tree">
|
||||
<field name="name">stock.warehouse.tree</field>
|
||||
<field name="model">stock.warehouse</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Warehouse">
|
||||
<field name="name"/>
|
||||
<field name="lot_input_id"/>
|
||||
<field name="lot_stock_id"/>
|
||||
<field name="lot_output_id"/>
|
||||
<field name="partner_address_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_warehouse_form">
|
||||
<field name="res_model">stock.warehouse</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_warehouse"/>
|
||||
<field name="view_id" ref="view_warehouse_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Configuration/Warehouse" id="menu_action_warehouse_form" action="action_warehouse_form"/>
|
||||
|
||||
|
|
@ -727,7 +768,7 @@
|
|||
<field name="res_model">stock.move</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_move_form"/>
|
||||
<field name="view_id" ref="view_move_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Low Level/Moves" id="menu_action_move_form2" action="action_move_form2"/>
|
||||
|
||||
|
|
@ -737,7 +778,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="domain">[('state','=','draft')]</field>
|
||||
<field name="view_id" ref="view_move_form"/>
|
||||
<field name="view_id" ref="view_move_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Low Level/Moves/Draft Moves" id="menu_action_move_form3" action="action_move_form3"/>
|
||||
|
||||
|
|
@ -747,7 +788,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="domain">[('state','=','assigned')]</field>
|
||||
<field name="view_id" ref="view_move_form"/>
|
||||
<field name="view_id" ref="view_move_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Low Level/Moves/Assigned Moves" id="menu_action_move_form4" action="action_move_form4"/>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue