[IMP] Add new field Decimal Precision in account, stock and rename production to Manufacturing Order in mrp

bzr revid: jap@tinyerp.com-20120430114958-3tsclex80znnayj6
This commit is contained in:
Jagdish Panchal (Open ERP) 2012-04-30 17:19:58 +05:30
parent 7584c565c2
commit 200b6cebda
6 changed files with 8 additions and 4 deletions

View File

@ -494,6 +494,7 @@ class account_account(osv.osv):
store={
'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
}),
'decimal_precision': fields.many2one('decimal.precision', 'Decimal Precision on Account'),
}
_defaults = {

View File

@ -174,6 +174,7 @@
<field name="debit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/>
<field name="credit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/>
<field name="balance" invisible="context.get('config_invisible', True)"/>
<field name="decimal_precision"/>
</group>
<notebook colspan="4">
<page string="General Information">

View File

@ -57,12 +57,12 @@
<field name ="complete_tax_set" invisible="1"/>
<newline/>
<group colspan="2" col="2">
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',True), ('has_fiscal_year','=',False)]}"/>
<field name="module_account_accountant"/>
<field name="module_account_asset"/>
</group>
<group colspan="2" col="2">
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',True), ('has_fiscal_year','=',False)]}"/>
<field name="currency_id" widget="selection"/>
<field name="module_account_budget"/>
</group>

View File

@ -186,6 +186,7 @@
<field name="number_of_packages"/>
<field name="weight"/>
<field name="weight_net"/>
<field name="decimal_precision"/>
</field>
</field>
</record>

View File

@ -66,6 +66,7 @@ class stock_picking(osv.osv):
}),
'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
'number_of_packages': fields.integer('Number of Packages'),
'decimal_precision': fields.many2one('decimal.precision', 'Decimal Precision on Stock Weight'),
}
def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None):

View File

@ -28,7 +28,7 @@ class mrp_config_settings(osv.osv_memory):
_inherit = 'res.config.settings'
_columns = {
'module_stock_planning': fields.boolean('Master Production Schedule',
'module_stock_planning': fields.boolean('Master Manufacturing Order Schedule',
help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
which works automatically based on minimum stock rules.
This installs the module stock_planning."""),
@ -44,7 +44,7 @@ class mrp_config_settings(osv.osv_memory):
'module_mrp_operations': fields.boolean("Detailed Planning of Work Orders",
help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
This installs the module mrp_operations."""),
'module_mrp_subproduct': fields.boolean("Produce Several Product from One Production",
'module_mrp_subproduct': fields.boolean("Produce Several Product from One Manufacturing Order",
help="""You can configure sub-products in the bill of material.
Without this module: A + B + C -> D.
With this module: A + B + C -> D + E.