[IMP] useability improvmeents misc
bzr revid: fp@fp-laptop-20101010173239-4563xgh24q2jt0lt
This commit is contained in:
parent
a6d5f625cc
commit
8cb8b0af2b
|
@ -26,32 +26,32 @@
|
|||
<group colspan="8">
|
||||
<group colspan="4" height="450" width="600">
|
||||
<field name="charts"/>
|
||||
<group colspan="4">
|
||||
<group colspan="4" groups="base.group_extended">
|
||||
<separator col="4" colspan="4" string="Configure Fiscal Year"/>
|
||||
<field name="company_id" colspan="4" widget="selection" groups="base.group_multi_company"/>
|
||||
<field name="date_start" on_change="on_change_start_date(date_start)"/>
|
||||
<field name="date_stop"/>
|
||||
<field name="period" colspan="4"/>
|
||||
</group>
|
||||
<group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
|
||||
<field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
|
||||
<field name="purchase_tax" groups="base.group_extended"/>
|
||||
</group>
|
||||
<group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
|
||||
<separator col="4" colspan="4" string="Bank and Cost Account"/>
|
||||
<field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
|
||||
<form string="">
|
||||
<field name="acc_name"/>
|
||||
<field name="account_type"/>
|
||||
<field name="currency_id" widget="selection"/>
|
||||
<field name="currency_id" widget="selection" groups="base.group_extended"/>
|
||||
</form>
|
||||
<tree editable="bottom" string="">
|
||||
<field name="acc_name"/>
|
||||
<field name="account_type"/>
|
||||
<field name="currency_id" widget="selection"/>
|
||||
<field name="currency_id" widget="selection" groups="base.group_extended"/>
|
||||
</tree>
|
||||
</field>
|
||||
</group>
|
||||
<group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
|
||||
<field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
|
||||
<field name="purchase_tax" colspan="2" />
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
</data>
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<tree string="Invoice Line">
|
||||
<field name="name"/>
|
||||
<field name="account_id" groups="base.group_user"/>
|
||||
<field name="account_id" groups="account.group_account_user"/>
|
||||
<field name="quantity"/>
|
||||
<field name="uos_id"/>
|
||||
<field name="price_unit"/>
|
||||
|
@ -60,7 +60,7 @@
|
|||
<field name="price_unit"/>
|
||||
<field name="discount" groups="base.group_extended"/>
|
||||
<field colspan="4" name="name"/>
|
||||
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
|
||||
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
|
||||
<field domain="[('type','<>','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
|
||||
<newline/>
|
||||
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
|
||||
|
@ -83,7 +83,7 @@
|
|||
<field name="sequence"/>
|
||||
<field name="manual"/>
|
||||
<field name="name"/>
|
||||
<field name="account_id" groups="base.group_user"/>
|
||||
<field name="account_id" groups="base.group_account_user"/>
|
||||
<field name="base"/>
|
||||
<field name="amount"/>
|
||||
</tree>
|
||||
|
@ -98,7 +98,7 @@
|
|||
<form string="Manual Invoice Taxes">
|
||||
<field name="name"/>
|
||||
<field name="sequence"/>
|
||||
<field name="account_id" groups="base.group_user"/>
|
||||
<field name="account_id"/>
|
||||
<field name="manual"/>
|
||||
<field name="amount"/>
|
||||
<field name="base" readonly="0"/>
|
||||
|
@ -234,14 +234,14 @@
|
|||
<page string="Payments" groups="base.group_extended">
|
||||
<field name="payment_ids" colspan="4" nolabel="1" >
|
||||
<tree string="Payments">
|
||||
<field name="date"/>
|
||||
<field name="date" string="Payment Date"/>
|
||||
<field name="ref"/>
|
||||
<field name="name"/>
|
||||
<field name="name" groups="base.group_extended"/>
|
||||
<field name="journal_id"/>
|
||||
<field name="debit"/>
|
||||
<field name="credit"/>
|
||||
<field name="amount_currency"/>
|
||||
<field name="currency_id"/>
|
||||
<field name="amount_currency" groups="base.group_extended"/>
|
||||
<field name="currency_id" groups="base.group_extended"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
|
@ -354,9 +354,9 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Invoice">
|
||||
<group col="10" colspan="4">
|
||||
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
|
||||
<filter icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
|
||||
<filter icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
|
||||
<filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
|
||||
<filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
|
||||
<filter name="invoices" icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
@ -450,7 +450,6 @@
|
|||
<menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
|
||||
|
||||
<record id="action_invoice_tree2" model="ir.actions.act_window">
|
||||
<field name="name">Supplier Invoices</field>
|
||||
<field name="res_model">account.invoice</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar,graph</field>
|
||||
|
|
|
@ -61,7 +61,7 @@ class account_installer(osv.osv_memory):
|
|||
'date_stop': fields.date('End Date', required=True),
|
||||
'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')],
|
||||
'Periods', required=True),
|
||||
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True),
|
||||
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts',required=True),
|
||||
'sale_tax':fields.float('Sale Tax(%)'),
|
||||
'purchase_tax':fields.float('Purchase Tax(%)'),
|
||||
'company_id': fields.many2one('res.company', 'Company'),
|
||||
|
|
|
@ -251,7 +251,7 @@ class account_invoice(osv.osv):
|
|||
\n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
|
||||
\n* The \'Paid\' state is set automatically when invoice is paid.\
|
||||
\n* The \'Cancelled\' state is used when user cancel invoice.'),
|
||||
'date_invoice': fields.date('Date Invoiced', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
|
||||
'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
|
||||
'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]},
|
||||
help="If you use payment terms, the due date will be computed automatically at the generation "\
|
||||
"of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
|
||||
|
|
|
@ -187,7 +187,7 @@ class res_partner(osv.osv):
|
|||
help="This payment term will be used instead of the default one for the current partner"),
|
||||
'ref_companies': fields.one2many('res.company', 'partner_id',
|
||||
'Companies that refers to partner'),
|
||||
'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
|
||||
'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
|
||||
}
|
||||
res_partner()
|
||||
|
||||
|
|
|
@ -143,7 +143,7 @@
|
|||
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="credit_limit" position="after">
|
||||
<field name="last_reconciliation_date"/>
|
||||
<field name="last_reconciliation_date" groups="base.group_extended"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -94,7 +94,7 @@
|
|||
<separator orientation="vertical"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="user_id" />
|
||||
<field name="date" string="Date Invoiced"/>
|
||||
<field name="date" string="Invoice Date"/>
|
||||
<field name="categ_id" />
|
||||
</group>
|
||||
<newline/>
|
||||
|
|
|
@ -165,7 +165,7 @@ class report_invoice_created(osv.osv):
|
|||
'amount_untaxed': fields.float('Untaxed', readonly=True),
|
||||
'amount_total': fields.float('Total', readonly=True),
|
||||
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
|
||||
'date_invoice': fields.date('Date Invoiced', readonly=True),
|
||||
'date_invoice': fields.date('Invoice Date', readonly=True),
|
||||
'date_due': fields.date('Due Date', readonly=True),
|
||||
'residual': fields.float('Residual', readonly=True),
|
||||
'state': fields.selection([
|
||||
|
|
|
@ -219,7 +219,7 @@
|
|||
<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="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
|
||||
<button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
|
||||
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
|
||||
</group>
|
||||
</form>
|
||||
|
@ -326,7 +326,7 @@
|
|||
<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="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
|
||||
<button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
|
||||
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
|
||||
</group>
|
||||
</form>
|
||||
|
|
|
@ -152,7 +152,7 @@
|
|||
<field name="state"/>
|
||||
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
|
||||
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
|
||||
<button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
|
||||
<button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
|
||||
<button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
|
||||
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
|
||||
</group>
|
||||
|
@ -256,7 +256,7 @@
|
|||
<field name="state"/>
|
||||
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
|
||||
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
|
||||
<button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
|
||||
<button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
|
||||
<button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
|
||||
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
|
||||
</group>
|
||||
|
|
|
@ -66,7 +66,7 @@
|
|||
|
||||
<record id="base_setup_company_todo" model="ir.actions.todo">
|
||||
<field name="action_id" ref="action_base_setup_company"/>
|
||||
<field name="sequence">3</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="restart">always</field>
|
||||
</record>
|
||||
</data>
|
||||
|
|
|
@ -45,8 +45,7 @@ class base_setup_installer(osv.osv_memory):
|
|||
help="Lets you install addons geared towards sharing knowledge "
|
||||
"with and between your employees."),
|
||||
'stock':fields.boolean('Warehouse Management',
|
||||
help="Helps you manage your stocks and stocks locations, as well "
|
||||
"as the flow of stock between warehouses."),
|
||||
help="Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."),
|
||||
'mrp':fields.boolean('Manufacturing',
|
||||
help="Helps you manage your manufacturing processes and generate "
|
||||
"reports on those processes."),
|
||||
|
@ -84,9 +83,6 @@ class base_setup_installer(osv.osv_memory):
|
|||
"applications selected to help you manage your auctions "
|
||||
"as well as the business processes around them."),
|
||||
}
|
||||
_defaults = {
|
||||
'crm': True,
|
||||
}
|
||||
|
||||
def _if_knowledge(self, cr, uid, ids, context=None):
|
||||
if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
|
||||
|
|
|
@ -104,8 +104,8 @@ Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07''')
|
|||
We suggest you to put bank information here:
|
||||
IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
|
||||
'logo':fields.binary('Logo'),
|
||||
'account_no':fields.char('Account No', size=64),
|
||||
'website': fields.char('Company Website', size=64, help="Exemple: http://openerp.com"),
|
||||
'account_no':fields.char('Bank Account No', size=64),
|
||||
'website': fields.char('Company Website', size=64, help="Example: http://openerp.com"),
|
||||
}
|
||||
|
||||
def execute(self, cr, uid, ids, context=None):
|
||||
|
|
|
@ -130,8 +130,11 @@
|
|||
<separator string="Description" colspan="4" />
|
||||
<field name="description" nolabel="1" colspan="4" />
|
||||
<separator colspan="4"/>
|
||||
<group col="8" colspan="4">
|
||||
<group col="8" colspan="4" groups="base.group_extended">
|
||||
<field name="state" />
|
||||
<button name="case_cancel" string="Cancel"
|
||||
states="draft,open" type="object"
|
||||
icon="gtk-cancel" />
|
||||
<button name="case_close" string="Done"
|
||||
states="open" type="object"
|
||||
icon="gtk-jump-to" />
|
||||
|
@ -141,9 +144,6 @@
|
|||
<button name="case_open" string="Confirm"
|
||||
states="draft" type="object"
|
||||
icon="gtk-go-forward" />
|
||||
<button name="case_cancel" string="Cancel"
|
||||
states="draft,open" type="object"
|
||||
icon="gtk-cancel" />
|
||||
</group>
|
||||
</page>
|
||||
<page string="Invitation Detail">
|
||||
|
@ -241,7 +241,7 @@
|
|||
<field name="location" />
|
||||
<field name="categ_id" string="Meeting Type"/>
|
||||
<field name="class" string="Privacy"/>
|
||||
<field name="state"/>
|
||||
<field name="state" groups="base.group_extended"/>
|
||||
<field name="user_id" invisible="1"/>
|
||||
<field name="show_as" invisible="1" string="Show time as"/>
|
||||
<button name="case_reset" string="Reset to Unconfirmed"
|
||||
|
@ -303,6 +303,7 @@
|
|||
<group col="12" colspan="4">
|
||||
<filter icon="terp-check" name="current" string="Current"
|
||||
domain="[('state','in',('draft', 'open'))]"
|
||||
groups="base.group_extended"
|
||||
help="Current Meetings"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" select="1" string="Subject"/>
|
||||
|
|
|
@ -74,6 +74,9 @@
|
|||
<separator colspan="4"/>
|
||||
<group col="10" colspan="4">
|
||||
<field name="state"/>
|
||||
<button name="case_cancel" string="Cancel"
|
||||
states="draft" type="object"
|
||||
icon="gtk-close" />
|
||||
<button name="case_reset" string="Reset to Draft"
|
||||
states="done,cancel" type="object"
|
||||
icon="gtk-convert" />
|
||||
|
@ -87,9 +90,6 @@
|
|||
states="open,pending" type="object"
|
||||
groups="base.group_extended"
|
||||
icon="gtk-go-up" />
|
||||
<button name="case_cancel" string="Cancel"
|
||||
states="draft" type="object"
|
||||
icon="gtk-close" />
|
||||
<button name="case_mark_lost" string="Mark Lost"
|
||||
states="open,pending" type="object"
|
||||
icon="gtk-cancel" />
|
||||
|
|
|
@ -156,7 +156,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
|
|||
|
||||
_columns = {
|
||||
'partner_id': fields.many2one('res.partner', 'Partner'),
|
||||
'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner')], 'Action'),
|
||||
'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner'), ('no','Do not create a partner')], 'Action'),
|
||||
}
|
||||
|
||||
def default_get(self, cr, uid, fields, context=None):
|
||||
|
|
|
@ -54,7 +54,6 @@
|
|||
<separator string="" colspan="4" />
|
||||
<group col="4" colspan="4">
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
|
||||
<button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/>
|
||||
<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
|
||||
</group>
|
||||
</form>
|
||||
|
|
|
@ -171,12 +171,13 @@ class crm_lead2partner(osv.osv_memory):
|
|||
|
||||
partner_ids.append(partner_id)
|
||||
|
||||
vals = {}
|
||||
if partner_id:
|
||||
vals.update({'partner_id': partner_id})
|
||||
if contact_id:
|
||||
vals.update({'partner_address_id': contact_id})
|
||||
lead_obj.write(cr, uid, [lead.id], vals)
|
||||
if data.action<>'no':
|
||||
vals = {}
|
||||
if partner_id:
|
||||
vals.update({'partner_id': partner_id})
|
||||
if contact_id:
|
||||
vals.update({'partner_address_id': contact_id})
|
||||
lead_obj.write(cr, uid, [lead.id], vals)
|
||||
return partner_ids
|
||||
|
||||
def make_partner(self, cr, uid, ids, context=None):
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<page string="Sales & Purchases" position="inside">
|
||||
<newline/>
|
||||
<group col="2" colspan="2">
|
||||
<group col="2" colspan="2" groups="base.group_extended">
|
||||
<separator string="Sales Properties" colspan="2"/>
|
||||
<field name="property_product_pricelist"/>
|
||||
</group>
|
||||
|
|
|
@ -289,10 +289,15 @@ class product_template(osv.osv):
|
|||
return {'value': {'uom_po_id': uom_id}}
|
||||
return False
|
||||
|
||||
def _get_categ(self, cursor, user, context={}):
|
||||
md = self.pool.get('ir.model.data')
|
||||
return md._get_id(cr, uid, 'product', 'cat0') or False
|
||||
|
||||
_defaults = {
|
||||
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
|
||||
'type': lambda *a: 'product',
|
||||
'list_price': lambda *a: 1,
|
||||
'categ_id': _get_categ,
|
||||
'cost_method': lambda *a: 'standard',
|
||||
'supply_method': lambda *a: 'buy',
|
||||
'standard_price': lambda *a: 1,
|
||||
|
|
|
@ -4,6 +4,10 @@
|
|||
<!--
|
||||
Resource: product.uom.categ
|
||||
-->
|
||||
<record id="cat0" model="product.category">
|
||||
<field name="name">All products</field>
|
||||
</record>
|
||||
|
||||
<record id="product_uom_categ_unit" model="product.uom.categ">
|
||||
<field name="name">Unit</field>
|
||||
</record>
|
||||
|
|
|
@ -5,17 +5,12 @@
|
|||
Resource: product.category
|
||||
-->
|
||||
|
||||
<record id="cat0" model="product.category">
|
||||
<field name="parent_id" ref="null"/>
|
||||
<field name="name">All products</field>
|
||||
<field name="type">view</field>
|
||||
</record>
|
||||
<record id="cat1" model="product.category">
|
||||
<field name="parent_id" ref="cat0"/>
|
||||
<field name="parent_id" ref="product.cat0"/>
|
||||
<field name="name">Sellable</field>
|
||||
</record>
|
||||
<record id="cat2" model="product.category">
|
||||
<field name="parent_id" ref="cat0"/>
|
||||
<field name="parent_id" ref="product.cat0"/>
|
||||
<field name="name">Private</field>
|
||||
</record>
|
||||
<record id="product_category_3" model="product.category">
|
||||
|
|
|
@ -89,7 +89,7 @@
|
|||
<group colspan="2" col="2">
|
||||
<separator string="Procurement" colspan="2"/>
|
||||
<field name="type"/>
|
||||
<field name="procure_method"/>
|
||||
<field name="procure_method" groups="base.group_extended"/>
|
||||
<field name="supply_method"/>
|
||||
</group>
|
||||
|
||||
|
@ -147,8 +147,8 @@
|
|||
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
|
||||
<field name="list_price"/>
|
||||
<newline/>
|
||||
<field name="price_margin" groups="group_product_variant"/>
|
||||
<field name="price_extra" groups="group_product_variant"/>
|
||||
<field name="price_margin" groups="product.group_product_variant"/>
|
||||
<field name="price_extra" groups="product.group_product_variant"/>
|
||||
<newline/>
|
||||
<field groups="base.group_extended" name="cost_method"/>
|
||||
<newline/>
|
||||
|
@ -304,9 +304,7 @@
|
|||
<tree string="Units of Measure">
|
||||
<field name="name"/>
|
||||
<field name="category_id"/>
|
||||
<field name="uom_type"/>
|
||||
<field name="factor"/>
|
||||
<field name="rounding"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -556,7 +554,7 @@
|
|||
<group colspan="2" col="2">
|
||||
<separator string="Procurement" colspan="2"/>
|
||||
<field name="type"/>
|
||||
<field name="procure_method"/>
|
||||
<field name="procure_method" groups="base.group_extended"/>
|
||||
<field name="supply_method"/>
|
||||
</group>
|
||||
|
||||
|
|
|
@ -46,8 +46,8 @@
|
|||
'wizard/purchase_order_group_view.xml',
|
||||
'wizard/purchase_installer.xml',
|
||||
'wizard/purchase_line_invoice_view.xml',
|
||||
'purchase_view.xml',
|
||||
'purchase_report.xml',
|
||||
'purchase_view.xml',
|
||||
'stock_view.xml',
|
||||
'partner_view.xml',
|
||||
'process/purchase_process.xml',
|
||||
|
|
|
@ -35,19 +35,32 @@
|
|||
action="base.action_partner_supplier_form" sequence="1"/>
|
||||
|
||||
<!--Inventory control-->
|
||||
<menuitem id="menu_procurement_management_inventory" name="Inventory Control"
|
||||
<menuitem id="menu_procurement_management_inventory" name="Receive Products"
|
||||
parent="base.menu_purchase_root" sequence="4"/>
|
||||
<menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
|
||||
name="Incoming Shipments" sequence="9"/>
|
||||
name="Incoming Shipments" sequence="9"
|
||||
groups="base.group_extended"/>
|
||||
<menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
|
||||
parent="menu_procurement_management_inventory" sequence="11"/>
|
||||
|
||||
<!--Invoice control-->
|
||||
<menuitem id="menu_procurement_management_invoice" name="Invoice Control"
|
||||
parent="base.menu_purchase_root" sequence="6"/>
|
||||
|
||||
<record id="action_invoice_pending" model="ir.actions.act_window">
|
||||
<field name="res_model">account.invoice</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar,graph</field>
|
||||
<field eval="False" name="view_id"/>
|
||||
<field name="domain">[('type','=','in_invoice')]</field>
|
||||
<field name="context">{'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
|
||||
<field name="search_view_id" ref="account.view_account_invoice_filter"/>
|
||||
<field name="help">This is the list of supplier invoice you are waiting for. You can select invoices and validate them once you have received the invoice and checked his data.</field>
|
||||
</record>
|
||||
|
||||
<menuitem name="Supplier Invoices to Receive"
|
||||
id="menu_procurement_management_pending_invoice"
|
||||
action="account.action_invoice_tree_pending_invoice"
|
||||
action="action_invoice_pending"
|
||||
parent="menu_procurement_management_invoice"
|
||||
sequence="13"/>
|
||||
|
||||
|
@ -100,13 +113,13 @@
|
|||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Purchase Order">
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=', 1)]"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1}"/>
|
||||
<field name="partner_address_id"/>
|
||||
<field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
|
||||
<field name="origin" groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<field colspan="4" name="order_line" nolabel="1" mode="tree,form">
|
||||
<tree colors="red:date_planned<=current_date;black:date_planned>current_date" string="Purchase Order Lines">
|
||||
<tree string="Purchase Order Lines">
|
||||
<field name="date_planned"/>
|
||||
<field name="name"/>
|
||||
<field name="product_qty"/>
|
||||
|
@ -124,15 +137,16 @@
|
|||
</group>
|
||||
<group col="11" colspan="4">
|
||||
<field name="state" readonly="1"/>
|
||||
<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
|
||||
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
|
||||
<button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
|
||||
<button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
|
||||
<button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
|
||||
<button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
|
||||
|
||||
<button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
|
||||
<button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
|
||||
<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-go-forward"/>
|
||||
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
|
||||
<button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
|
||||
<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
|
||||
|
||||
</group>
|
||||
</page>
|
||||
<page string="Delivery & Invoices" groups="base.group_extended">
|
||||
|
@ -200,7 +214,7 @@
|
|||
<field name="model">purchase.order</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree colors="grey:state in ('approved','done');blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
|
||||
<tree colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
|
||||
<field name="name" string="Reference"/>
|
||||
<field name="date_order" string="Order Date"/>
|
||||
<field name="partner_id"/>
|
||||
|
@ -222,7 +236,7 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">purchase.order</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="context">{'search_default_draft': 1,'search_default_create_uid':uid}</field>
|
||||
<field name="context">{'search_default_draft': 1}</field>
|
||||
<field name="view_mode">tree,form,graph,calendar</field>
|
||||
<field name="search_view_id" ref="view_purchase_order_filter"/>
|
||||
<field name="help">With the Requests for quotation menu you can create new quotations, review existing one and confirm them to order once the supplier offer is approved.</field>
|
||||
|
@ -287,7 +301,7 @@
|
|||
<field name="model">purchase.order.line</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree colors="red:date_planned<=current_date;black:date_planned>current_date" string="Purchase Order Lines">
|
||||
<tree string="Purchase Order Lines">
|
||||
<field name="order_id"/>
|
||||
<field name="name"/>
|
||||
<field name="date_planned" widget="date" width="135"/>
|
||||
|
@ -367,14 +381,14 @@
|
|||
<act_window
|
||||
context="{'search_default_partner_id': [active_id]}"
|
||||
id="act_res_partner_2_purchase_order"
|
||||
name="Purchase orders"
|
||||
name="Purchase Orders"
|
||||
res_model="purchase.order"
|
||||
src_model="res.partner"/>
|
||||
|
||||
<act_window
|
||||
context="{'search_default_product_id': [active_id]}"
|
||||
id="action_purchase_line_product_tree"
|
||||
name="Product purchases"
|
||||
name="Purchases"
|
||||
res_model="purchase.order.line"
|
||||
src_model="product.product"
|
||||
groups="base.group_extended"/>
|
||||
|
@ -406,7 +420,7 @@
|
|||
id="menu_purchase_line_order_draft"
|
||||
groups="base.group_extended"
|
||||
parent="menu_procurement_management_invoice"
|
||||
sequence="12"/>
|
||||
sequence="72"/>
|
||||
|
||||
<!--
|
||||
Procurements
|
||||
|
|
|
@ -103,7 +103,7 @@
|
|||
<record id="trans_confirmed_router" model="workflow.transition">
|
||||
<field name="act_from" ref="act_confirmed"/>
|
||||
<field name="act_to" ref="act_router"/>
|
||||
<field name="signal">purchase_approve</field>
|
||||
<!-- <field name="signal">purchase_approve</field> removed from simplification/useability -->
|
||||
</record>
|
||||
<record id="trans_router_picking" model="workflow.transition">
|
||||
<field name="act_from" ref="act_router"/>
|
||||
|
|
|
@ -17,8 +17,9 @@
|
|||
<act_window
|
||||
domain="[('purchase_id', '=', active_id)]"
|
||||
id="act_purchase_order_2_stock_picking"
|
||||
name="Picking"
|
||||
name="Receptions"
|
||||
res_model="stock.picking"
|
||||
groups="base.group_extended"
|
||||
src_model="purchase.order"
|
||||
context="{'contact_display': 'partner'}" />
|
||||
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record id="view_purchase_order_group" model="ir.ui.view">
|
||||
<record id="view_purchase_order_group" model="ir.ui.view">
|
||||
<field name="name">Merger Purchase Orders</field>
|
||||
<field name="model">purchase.order.group</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Merge orders">
|
||||
<separator string="Are you sure you want to merge these orders ?" colspan="4"/>
|
||||
<newline/>
|
||||
<label string="
|
||||
<separator string="Are you sure you want to merge these orders ?" colspan="4"/>
|
||||
<newline/>
|
||||
<label string="
|
||||
Please note that:
|
||||
Orders will only be merged if:
|
||||
* Purchase Orders are in draft
|
||||
|
@ -17,23 +17,24 @@ Orders will only be merged if:
|
|||
* Purchase Orders are have same stock location, same pricelist
|
||||
Lines will only be merged if:
|
||||
* Order lines are exactly the same except for the product,quantity and unit
|
||||
" colspan="4"/>
|
||||
<newline/>
|
||||
<separator string="" colspan="4" />
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
|
||||
</form>
|
||||
" colspan="4"/>
|
||||
<newline/>
|
||||
<separator string="" colspan="4" />
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
</record>
|
||||
|
||||
<act_window name="Merge Purchase orders"
|
||||
res_model="purchase.order.group"
|
||||
src_model="purchase.order"
|
||||
view_mode="form"
|
||||
target="new"
|
||||
<act_window name="Merge Purchase orders"
|
||||
res_model="purchase.order.group"
|
||||
src_model="purchase.order"
|
||||
view_mode="form"
|
||||
target="new"
|
||||
key2="client_action_multi"
|
||||
id="action_view_purchase_order_group"/>
|
||||
|
||||
groups="base.group_extended"
|
||||
id="action_view_purchase_order_group"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
|
|
|
@ -250,7 +250,7 @@ class sale_order(osv.osv):
|
|||
'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
|
||||
'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
|
||||
'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done. It will be set to True if the ordered quantities are available and the picking is done. If the ordered quantities are not available Procurement generates a Purchase/Manufacturing order. Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"),
|
||||
'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sale order has been delivered. This field is updated only after the scheduler have been launched !"),
|
||||
'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
|
||||
'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
|
||||
'invoiced': fields.function(_invoiced, method=True, string='Paid',
|
||||
|
@ -912,7 +912,7 @@ class sale_order_line(osv.osv):
|
|||
else:
|
||||
a = self.pool.get('ir.property').get(cr, uid,
|
||||
'property_account_income_categ', 'product.category',
|
||||
context=context)
|
||||
context=context).id
|
||||
uosqty = _get_line_qty(line)
|
||||
uos_id = _get_line_uom(line)
|
||||
pu = 0.0
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
<field name="model">sale.order</field>
|
||||
<field name="type">calendar</field>
|
||||
<field name="arch" type="xml">
|
||||
<calendar string="Sales orders" color="state" date_start="date_order">
|
||||
<calendar string="Sales Orders" color="state" date_start="date_order">
|
||||
<field name="partner_id"/>
|
||||
<field name="amount_total"/>
|
||||
</calendar>
|
||||
|
@ -67,7 +67,7 @@
|
|||
<field name="model">sale.order</field>
|
||||
<field name="type">graph</field>
|
||||
<field name="arch" type="xml">
|
||||
<graph string="Sales orders" type="bar">
|
||||
<graph string="Sales Orders" type="bar">
|
||||
<field name="partner_id"/>
|
||||
<field name="amount_total" operator="+"/>
|
||||
</graph>
|
||||
|
@ -79,7 +79,7 @@
|
|||
<field name="model">sale.order</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Sales orders" colors="grey:state=='done'">
|
||||
<tree string="Sales Orders" colors="grey:state=='done'">
|
||||
<field name="name"/>
|
||||
<field name="date_order"/>
|
||||
<field name="partner_id"/>
|
||||
|
@ -98,7 +98,7 @@
|
|||
<field name="model">sale.order</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Sales order">
|
||||
<form string="Sales Order">
|
||||
<group col="6" colspan="4">
|
||||
<field name="name"/>
|
||||
<field name="date_order"/>
|
||||
|
@ -181,7 +181,7 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
<tree string="Sales order lines">
|
||||
<tree string="Sales Order Lines">
|
||||
<field colspan="4" name="name"/>
|
||||
<field name="product_uom_qty" string="Qty"/>
|
||||
<field name="product_uom" string="UoM"/>
|
||||
|
@ -344,7 +344,7 @@ to your configuration: from the sales order, from the pickings, etc.
|
|||
<field name="model">sale.order.line</field>
|
||||
<field name="type">graph</field>
|
||||
<field name="arch" type="xml">
|
||||
<graph string="Sales order lines">
|
||||
<graph string="Sales Order Lines">
|
||||
<field name="product_id"/>
|
||||
<field name="price_subtotal" operator="+"/>
|
||||
</graph>
|
||||
|
@ -356,7 +356,7 @@ to your configuration: from the sales order, from the pickings, etc.
|
|||
<field name="model">sale.order.line</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Sales order lines">
|
||||
<tree string="Sales Order Lines">
|
||||
<field name="order_id"/>
|
||||
<field name="order_partner_id"/>
|
||||
<field name="product_id"/>
|
||||
|
@ -517,7 +517,8 @@ to your configuration: from the sales order, from the pickings, etc.
|
|||
src_model="product.product"
|
||||
groups="base.group_extended"/>
|
||||
|
||||
<menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"/>
|
||||
<menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"
|
||||
groups="base.group_extended"/>
|
||||
<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/>
|
||||
<!-- configartion view -->
|
||||
|
||||
|
|
|
@ -54,10 +54,6 @@ class crm_make_sale(osv.osv_memory):
|
|||
def view_init(self, cr, uid, fields_list, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if context.get('active_ids', False) and context['active_ids']:
|
||||
for line in self.pool.get('crm.lead').browse(cr, uid, context['active_ids']):
|
||||
if not line.section_id:
|
||||
raise osv.except_osv(_('Warning !'), _(' Sales Team is not specified.'))
|
||||
return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)
|
||||
|
||||
def makeOrder(self, cr, uid, ids, context=None):
|
||||
|
|
|
@ -8,12 +8,10 @@
|
|||
<field name="model">crm.make.sale</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Create a Sale Order" >
|
||||
<form string="Convert to Quotation" >
|
||||
<group colspan="4">
|
||||
<field name="partner_id" required="1"/>
|
||||
<field name="shop_id" required="1" widget="selection"/>
|
||||
<field name="analytic_account" domain="[('type','=','normal')]"
|
||||
groups="base.group_extended"/>
|
||||
<field name="close"/>
|
||||
</group>
|
||||
<newline/>
|
||||
|
|
|
@ -1881,6 +1881,14 @@ class stock_move(osv.osv):
|
|||
move_obj = self.pool.get('account.move')
|
||||
if context is None:
|
||||
context = {}
|
||||
|
||||
todo = []
|
||||
for move in self.browse(cr, uid, ids):
|
||||
if move.state=="draft":
|
||||
todo.append(move.id)
|
||||
if todo:
|
||||
self.action_confirm(cr, uid, todo, context=context)
|
||||
|
||||
for move in self.browse(cr, uid, ids):
|
||||
if move.picking_id:
|
||||
picking_ids.append(move.picking_id.id)
|
||||
|
|
|
@ -172,7 +172,7 @@
|
|||
context="{'type': 'move_history_ids','field': ''}" colspan="2"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Stock Moves">
|
||||
<page string="Inventory Moves">
|
||||
<field colspan="2" name="move_ids" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
|
@ -287,7 +287,7 @@
|
|||
<page string="Revisions">
|
||||
<field colspan="2" name="revisions" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Stock Moves">
|
||||
<page string="Inventory Moves">
|
||||
<field colspan="2" name="move_ids" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
|
@ -348,7 +348,7 @@
|
|||
# Lot composition (history)
|
||||
#
|
||||
<record id="stock_move_tree" model="ir.ui.view">
|
||||
<field name="name">Stock Moves</field>
|
||||
<field name="name">Inventory Moves</field>
|
||||
<field name="model">stock.move</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="field_parent">move_history_ids</field>
|
||||
|
@ -373,7 +373,7 @@
|
|||
</record>
|
||||
|
||||
<record id="stock_move_tree2" model="ir.ui.view">
|
||||
<field name="name">Stock Moves</field>
|
||||
<field name="name">Inventory Moves</field>
|
||||
<field name="model">stock.move</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="field_parent">move_history_ids2</field>
|
||||
|
@ -624,7 +624,7 @@
|
|||
<notebook colspan="4">
|
||||
<page string="Products">
|
||||
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
|
||||
<tree colors="grey:scrapped == True" string="Stock Moves">
|
||||
<tree colors="grey:scrapped == True" string="Inventory Moves">
|
||||
<field name="name" string="Move Name"/>
|
||||
<field name="product_id"/>
|
||||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
|
@ -660,7 +660,7 @@
|
|||
<field name="date_expected" string="Date Expected"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
<form string="Stock Moves">
|
||||
<form string="Inventory Moves">
|
||||
<group colspan="2" col="4">
|
||||
<separator colspan="4" string="Move Information"/>
|
||||
<field name="name" invisible="1" colspan="4"/>
|
||||
|
@ -717,7 +717,7 @@
|
|||
</field>
|
||||
<group col="10" colspan="4">
|
||||
<field name="state" readonly="1"/>
|
||||
<button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object" icon="gtk-apply"/>
|
||||
<button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
|
||||
<button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
|
||||
<button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
|
||||
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
|
||||
|
@ -810,7 +810,7 @@
|
|||
<notebook colspan="4">
|
||||
<page string="Products">
|
||||
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
|
||||
<tree colors="grey:scrapped == True" string="Stock Moves">
|
||||
<tree colors="grey:scrapped == True" string="Inventory Moves">
|
||||
<field name="name" string="Move Name"/>
|
||||
<field name="product_id"/>
|
||||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
|
@ -845,7 +845,7 @@
|
|||
<field name="date_expected" string="Date Expected"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
<form string="Stock Moves">
|
||||
<form string="Inventory Moves">
|
||||
<group colspan="2" col="4">
|
||||
<separator colspan="2" string="Move Information"/>
|
||||
<field name="name" invisible="1" colspan="4"/>
|
||||
|
@ -1029,7 +1029,7 @@
|
|||
<notebook colspan="4">
|
||||
<page string="Products">
|
||||
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
|
||||
<tree colors="grey:scrapped==True" string="Stock Moves">
|
||||
<tree colors="grey:scrapped==True" string="Inventory Moves">
|
||||
<field name="product_id"/>
|
||||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
<field name="product_uom" string="UoM"/>
|
||||
|
@ -1060,7 +1060,7 @@
|
|||
<button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
|
||||
<button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
|
||||
</tree>
|
||||
<form string="Stock Moves">
|
||||
<form string="Inventory Moves">
|
||||
<group colspan="2" col="4">
|
||||
<separator colspan="4" string="Move Information"/>
|
||||
<field name="name" invisible="1" colspan="4" />
|
||||
|
@ -1242,7 +1242,7 @@
|
|||
<notebook colspan="4">
|
||||
<page string="General Information">
|
||||
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
|
||||
<tree colors="grey:scrapped==True" string="Stock Moves">
|
||||
<tree colors="grey:scrapped==True" string="Inventory Moves">
|
||||
<field name="product_id" readonly="1"/>
|
||||
<field name="product_qty" readonly="1"/>
|
||||
<field name="product_uom" string="UoM" readonly="1"/>
|
||||
|
@ -1271,7 +1271,7 @@
|
|||
<field name="location_dest_id"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
<form string="Stock Moves">
|
||||
<form string="Inventory Moves">
|
||||
<group colspan="2" col="4">
|
||||
<separator colspan="4" string="Move Information"/>
|
||||
<field name="name" invisible="1" colspan="4"/>
|
||||
|
@ -1516,33 +1516,35 @@
|
|||
<field name="type">form</field>
|
||||
<field eval="4" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Stock Moves">
|
||||
<group colspan="2" col="4">
|
||||
<separator colspan="4" string="Move Information"/>
|
||||
<field name="name" colspan="4"/>
|
||||
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4"/>
|
||||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
|
||||
<form string="Inventory Moves">
|
||||
<group colspan="4" col="7">
|
||||
<separator colspan="7" string="Move Information"/>
|
||||
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)"/>
|
||||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
<field name="product_uom" string="Unit Of Measure" widget="selection"/>
|
||||
<button name="%(stock.move_scrap)d" groups="base.group_extended"
|
||||
string="Scrap" type="action"
|
||||
icon="gtk-convert" context="{'scrap': True}"
|
||||
states="draft,waiting,confirmed,assigned" colspan="1"/>
|
||||
<field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
|
||||
<field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
|
||||
<field name="product_uos" groups="product.product_uos" colspan="4"/>
|
||||
<newline/>
|
||||
<field name="name" string="Reason"/>
|
||||
<field name="product_uos_qty" groups="product.product_uos"/>
|
||||
<field name="product_uos" groups="product.product_uos"/>
|
||||
<newline/>
|
||||
<field name="location_id"/>
|
||||
<field name="location_dest_id"/>
|
||||
</group>
|
||||
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Locations & Picking" colspan="2" />
|
||||
<field name="location_id" widget="selection"/>
|
||||
<field name="location_dest_id" widget="selection"/>
|
||||
<field name="picking_id"/>
|
||||
<field name="address_id" context="{'contact_display':'partner'}"/>
|
||||
<field name="picking_id"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
</group>
|
||||
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Dates & Priority" colspan="2" />
|
||||
<field name="date"/>
|
||||
<field name="date" groups="base.group_extended"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="date_expected"/>
|
||||
<field name="priority"/>
|
||||
|
@ -1568,7 +1570,7 @@
|
|||
<separator colspan="4"/>
|
||||
<field name="state"/>
|
||||
<group col="4" colspan="2">
|
||||
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
|
||||
<button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
|
||||
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
|
||||
<button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
|
||||
<button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
|
||||
|
@ -1583,7 +1585,7 @@
|
|||
<field name="type">search</field>
|
||||
<field eval="3" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Stock Moves">
|
||||
<search string="Inventory Moves">
|
||||
<group col="14" colspan="4">
|
||||
<filter icon="terp-go-today" string="Today" domain="[('date_planned','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
@ -1624,7 +1626,7 @@
|
|||
</record>
|
||||
|
||||
<record id="action_move_form2" model="ir.actions.act_window">
|
||||
<field name="name">Stock Moves</field>
|
||||
<field name="name">Inventory Moves</field>
|
||||
<field name="res_model">stock.move</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
|
@ -1673,7 +1675,7 @@
|
|||
states="draft,assigned,confirmed,done"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="state"/>
|
||||
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
|
||||
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes" groups="base.group_extended"/>
|
||||
<button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
|
||||
<button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
|
||||
</tree>
|
||||
|
@ -1687,35 +1689,36 @@
|
|||
<field eval="6" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Moves">
|
||||
<group colspan="2" col="4">
|
||||
<separator colspan="4" string="Move Information"/>
|
||||
<field name="name" colspan="4"/>
|
||||
<field name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)" colspan="4"/>
|
||||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
|
||||
<group colspan="4" col="7">
|
||||
<field name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)"/>
|
||||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
<field name="product_uom" widget="selection"/>
|
||||
<button name="%(stock.move_scrap)d" groups="base.group_extended"
|
||||
string="Scrap" type="action"
|
||||
icon="gtk-convert" context="{'scrap': True}"
|
||||
states="draft,waiting,confirmed,assigned" colspan="1"/>
|
||||
<field name="product_uom" widget="selection" colspan="4"/>
|
||||
<field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
|
||||
<field name="product_uos" widget="selection" groups="product.product_uos" colspan="4"/>
|
||||
</group>
|
||||
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Locations & Picking" colspan="2" />
|
||||
<field name="location_id" widget="selection"/>
|
||||
<field name="location_dest_id" widget="selection"/>
|
||||
<field name="picking_id"/>
|
||||
<field name="address_id" context="{'contact_display':'partner'}"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<newline/>
|
||||
<field name="name" string="Reason"/>
|
||||
<field name="product_uos_qty" groups="product.product_uos"/>
|
||||
<field name="product_uos" widget="selection" groups="product.product_uos"/>
|
||||
<newline/>
|
||||
<field name="location_id"/>
|
||||
<field name="location_dest_id"/>
|
||||
</group>
|
||||
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Dates & Priority" colspan="2" />
|
||||
<field name="date"/>
|
||||
<field name="date" groups="base.group_extended"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="date_expected"/>
|
||||
<field name="priority"/>
|
||||
<field name="priority" groups="base.group_extended"/>
|
||||
</group>
|
||||
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Locations & Picking" colspan="2" />
|
||||
<field name="address_id" context="{'contact_display':'partner'}"/>
|
||||
<field name="picking_id"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
</group>
|
||||
|
||||
<group colspan="2" col="4" groups="base.group_extended">
|
||||
|
@ -1737,11 +1740,11 @@
|
|||
<separator colspan="4"/>
|
||||
<field name="state"/>
|
||||
<group col="5" colspan="2">
|
||||
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
|
||||
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
|
||||
<button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
|
||||
<button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
|
||||
<button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
|
||||
<button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
|
||||
<button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
|
||||
<button name="action_done" states="draft,confirmed,assigned" string="Done" type="object" icon="gtk-go-forward"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
|
@ -1753,7 +1756,7 @@
|
|||
<field name="type">search</field>
|
||||
<field eval="6" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Stock Moves">
|
||||
<search string="Inventory Moves">
|
||||
<group col="8" colspan="4">
|
||||
<filter icon="terp-go-today" string="Today" domain="[('date_planned','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
@ -1790,7 +1793,7 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]</field>
|
||||
<field name="view_id" ref="view_move_tree_reception_picking"/>
|
||||
<field name="context">{"search_default_receive":1}</field>
|
||||
<field name="context" eval="'{\'search_default_receive\':1,\'full\':1,\'default_location_dest_id\': '+str(ref('stock.stock_location_stock'))+', \'default_location_id\': '+str(ref('stock.stock_location_suppliers'))+'}'"/>
|
||||
<field name="search_view_id" ref="view_move_search_reception_picking"/>
|
||||
</record>
|
||||
|
||||
|
@ -1852,7 +1855,7 @@
|
|||
<act_window
|
||||
context="{'location': active_id, 'search_default_done': 1,'search_default_product_id': [active_id]}"
|
||||
id="act_product_stock_move_open"
|
||||
name="Stock Moves"
|
||||
name="Inventory Moves"
|
||||
res_model="stock.move"
|
||||
src_model="product.product"/>
|
||||
|
||||
|
@ -1867,7 +1870,7 @@
|
|||
context="{'location': active_id, 'search_default_future': 1,'search_default_product_id': [active_id]}"
|
||||
domain="[('state','in',('waiting','confirmed','assigned'))]"
|
||||
id="act_product_stock_move_futur_open"
|
||||
name="Future Stock Moves"
|
||||
name="Future Inventory Moves"
|
||||
res_model="stock.move"
|
||||
src_model="product.product"
|
||||
groups="base.group_extended"/>
|
||||
|
@ -1928,7 +1931,7 @@
|
|||
|
||||
<!-- Delivery Product Vs Planned -->
|
||||
<record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
|
||||
<field name="name">Delivery Products</field>
|
||||
<field name="name">Delivered Products</field>
|
||||
<field name="model">report.delivery.products.planned</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
|
@ -1941,7 +1944,7 @@
|
|||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
|
||||
<field name="name">Delivery Products</field>
|
||||
<field name="name">Delivered Products</field>
|
||||
<field name="model">report.delivery.products.planned</field>
|
||||
<field name="type">graph</field>
|
||||
<field name="arch" type="xml">
|
||||
|
@ -1954,7 +1957,7 @@
|
|||
</record>
|
||||
|
||||
<record id="action_move_delivery_products_planned" model="ir.actions.act_window">
|
||||
<field name="name">Delivery Products Vs Planned</field>
|
||||
<field name="name">Delivered Products Vs Planned</field>
|
||||
<field name="res_model">report.delivery.products.planned</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
|
@ -1998,7 +2001,7 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]</field>
|
||||
<field name="view_id" ref="view_move_tree_reception_picking"/>
|
||||
<field name="context">{"search_default_receive":1}</field>
|
||||
<field name="context" eval="'{\'search_default_receive\':1,\'full\':1,\'default_location_id\': '+str(ref('stock.stock_location_stock'))+', \'default_location_dest_id\': '+str(ref('stock.stock_location_customers'))+'}'"/>
|
||||
<field name="search_view_id" ref="view_move_search_reception_picking"/>
|
||||
</record>
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<act_window name="Delivery Product"
|
||||
<act_window name="Deliver Products"
|
||||
res_model="stock.partial.move"
|
||||
src_model="stock.move"
|
||||
view_mode="form"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<openerp>
|
||||
<data>
|
||||
<record id="action_partial_picking" model="ir.actions.act_window">
|
||||
<field name="name">Making Picking</field>
|
||||
<field name="name">Process Picking</field>
|
||||
<field name="res_model">stock.partial.picking</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
|
|
Loading…
Reference in New Issue