diff --git a/addons/account/partner.py b/addons/account/partner.py index f582da6b765..a7df31b2f32 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -189,44 +189,34 @@ class res_partner(osv.osv): 'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."), 'debit_limit': fields.float('Payable Limit'), 'property_account_payable': fields.property( - 'account.account', type='many2one', relation='account.account', string="Account Payable", - view_load=True, domain="[('type', '=', 'payable')]", help="This account will be used instead of the default one as the payable account for the current partner", required=True), 'property_account_receivable': fields.property( - 'account.account', type='many2one', relation='account.account', string="Account Receivable", - view_load=True, domain="[('type', '=', 'receivable')]", help="This account will be used instead of the default one as the receivable account for the current partner", required=True), 'property_account_position': fields.property( - 'account.fiscal.position', type='many2one', relation='account.fiscal.position', string="Fiscal Position", - view_load=True, help="The fiscal position will determine taxes and accounts used for the partner.", ), 'property_payment_term': fields.property( - 'account.payment.term', type='many2one', relation='account.payment.term', string ='Customer Payment Term', - view_load=True, help="This payment term will be used instead of the default one for sale orders and customer invoices"), 'property_supplier_payment_term': fields.property( - 'account.payment.term', type='many2one', relation='account.payment.term', string ='Supplier Payment Term', - view_load=True, help="This payment term will be used instead of the default one for purchase orders and supplier invoices"), 'ref_companies': fields.one2many('res.company', 'partner_id', 'Companies that refers to partner'), diff --git a/addons/account/product.py b/addons/account/product.py index 3df3ad9bd17..b7bffee43a9 100644 --- a/addons/account/product.py +++ b/addons/account/product.py @@ -25,18 +25,14 @@ class product_category(osv.osv): _inherit = "product.category" _columns = { 'property_account_income_categ': fields.property( - 'account.account', type='many2one', relation='account.account', string="Income Account", - view_load=True, help="This account will be used for invoices to value sales."), 'property_account_expense_categ': fields.property( - 'account.account', type='many2one', relation='account.account', string="Expense Account", - view_load=True, help="This account will be used for invoices to value expenses."), } @@ -54,18 +50,14 @@ class product_template(osv.osv): 'product_supplier_taxes_rel', 'prod_id', 'tax_id', 'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','in',['purchase','all'])]), 'property_account_income': fields.property( - 'account.account', type='many2one', relation='account.account', string="Income Account", - view_load=True, help="This account will be used for invoices instead of the default one to value sales for the current product."), 'property_account_expense': fields.property( - 'account.account', type='many2one', relation='account.account', string="Expense Account", - view_load=True, help="This account will be used for invoices instead of the default one to value expenses for the current product."), } diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py index b52d9ed3bbd..1c9e8ee3673 100644 --- a/addons/account_anglo_saxon/product.py +++ b/addons/account_anglo_saxon/product.py @@ -24,27 +24,21 @@ class product_category(osv.osv): _inherit = "product.category" _columns = { 'property_account_creditor_price_difference_categ': fields.property( - 'account.account', type='many2one', relation='account.account', string="Price Difference Account", - view_load=True, help="This account will be used to value price difference between purchase price and cost price."), #Redefine fields to change help text for anglo saxon methodology. 'property_account_income_categ': fields.property( - 'account.account', type='many2one', relation='account.account', string="Income Account", - view_load=True, help="This account will be used to value outgoing stock using sale price."), 'property_account_expense_categ': fields.property( - 'account.account', type='many2one', relation='account.account', string="Expense Account", - view_load=True, help="This account will be used to value outgoing stock using cost price."), } @@ -53,27 +47,21 @@ class product_template(osv.osv): _inherit = "product.template" _columns = { 'property_account_creditor_price_difference': fields.property( - 'account.account', type='many2one', relation='account.account', string="Price Difference Account", - view_load=True, help="This account will be used to value price difference between purchase price and cost price."), #Redefine fields to change help text for anglo saxon methodology. 'property_account_income': fields.property( - 'account.account', type='many2one', relation='account.account', string="Income Account", - view_load=True, help="This account will be used to value outgoing stock using sale price."), 'property_account_expense': fields.property( - 'account.account', type='many2one', relation='account.account', string="Expense Account", - view_load=True, help="This account will be used to value outgoing stock using cost price."), } diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py index 477315dfc9b..226b5e493ab 100644 --- a/addons/delivery/partner.py +++ b/addons/delivery/partner.py @@ -25,11 +25,9 @@ class res_partner(osv.osv): _inherit = 'res.partner' _columns = { 'property_delivery_carrier': fields.property( - 'delivery.carrier', type='many2one', relation='delivery.carrier', string="Delivery Method", - view_load=True, help="This delivery method will be used when invoicing from picking."), } diff --git a/addons/product/partner.py b/addons/product/partner.py index fbfee76d0b2..d6b615ed88a 100644 --- a/addons/product/partner.py +++ b/addons/product/partner.py @@ -27,12 +27,10 @@ class res_partner(osv.osv): _inherit = 'res.partner' _columns = { 'property_product_pricelist': fields.property( - 'product.pricelist', type='many2one', relation='product.pricelist', domain=[('type','=','sale')], string="Sale Pricelist", - view_load=True, help="This pricelist will be used, instead of the default one, for sales to the current partner"), } diff --git a/addons/product/product.py b/addons/product/product.py index 656812bebbb..6e1128985aa 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -321,7 +321,7 @@ class product_template(osv.osv): 'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."), 'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."), 'uos_id' : fields.many2one('product.uom', 'Unit of Sale', - help='Sepcify a unit of measure here if invoicing is made in another unit of measure than inventory. Keep empty to use the default unit of measure.'), + help='Specify a unit of measure here if invoicing is made in another unit of measure than inventory. Keep empty to use the default unit of measure.'), 'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'), help='Coefficient to convert default Unit of Measure to Unit of Sale\n' ' uos = uom * coeff'), diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py index 5e5af0815e3..52c5d798eeb 100644 --- a/addons/purchase/partner.py +++ b/addons/purchase/partner.py @@ -48,12 +48,10 @@ class res_partner(osv.osv): _columns = { 'property_product_pricelist_purchase': fields.property( - 'product.pricelist', type='many2one', relation='product.pricelist', domain=[('type','=','purchase')], string="Purchase Pricelist", - view_load=True, help="This pricelist will be used, instead of the default one, for purchases from the current partner"), 'purchase_order_count': fields.function(_purchase_order_count, string='# of Purchase Order', type='integer'), 'purchase_order_ids': fields.one2many('purchase.order','partner_id','Purchase Order') diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py index cea2b4e8329..5a914cfbcf0 100644 --- a/addons/report_webkit/ir_report.py +++ b/addons/report_webkit/ir_report.py @@ -37,10 +37,10 @@ from webkit_report import WebKitParser class ir_actions_report_xml(orm.Model): _inherit = 'ir.actions.report.xml' _columns = { - 'webkit_header': fields.property('ir.header_webkit', + 'webkit_header': fields.property( type='many2one', relation='ir.header_webkit', string='Webkit Header', help="The header linked to the report", - view_load=True, required=True), + required=True), 'webkit_debug': fields.boolean('Webkit debug', help="Enable the webkit engine debugger"), 'report_webkit_data': fields.text('Webkit Template', diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py index 9e10c826898..73fd5b672f1 100644 --- a/addons/sale_journal/sale_journal.py +++ b/addons/sale_journal/sale_journal.py @@ -43,11 +43,9 @@ class res_partner(osv.osv): _inherit = 'res.partner' _columns = { 'property_invoice_type': fields.property( - 'sale_journal.invoice.type', type = 'many2one', relation = 'sale_journal.invoice.type', string = "Invoicing Type", - view_load = True, group_name = "Accounting Properties", help = "This invoicing type will be used, by default, to invoice the current partner."), } diff --git a/addons/stock/partner.py b/addons/stock/partner.py index b8bad4faf95..3aaf1c663e5 100644 --- a/addons/stock/partner.py +++ b/addons/stock/partner.py @@ -25,19 +25,15 @@ class res_partner(osv.osv): _inherit = 'res.partner' _columns = { 'property_stock_customer': fields.property( - 'stock.location', type='many2one', relation='stock.location', string="Customer Location", - view_load=True, help="This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"), 'property_stock_supplier': fields.property( - 'stock.location', type='many2one', relation='stock.location', string="Supplier Location", - view_load=True, help="This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"), } diff --git a/addons/stock/product.py b/addons/stock/product.py index f31c2b21ef1..20fc660be0f 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -477,37 +477,33 @@ class product_template(osv.osv): _inherit = 'product.template' _columns = { 'property_stock_procurement': fields.property( - 'stock.location', type='many2one', relation='stock.location', string="Procurement Location", - view_load=True, domain=[('usage','like','procurement')], help="This stock location will be used, instead of the default one, as the source location for stock moves generated by procurements."), 'property_stock_production': fields.property( - 'stock.location', type='many2one', relation='stock.location', string="Production Location", - view_load=True, domain=[('usage','like','production')], help="This stock location will be used, instead of the default one, as the source location for stock moves generated by manufacturing orders."), 'property_stock_inventory': fields.property( - 'stock.location', type='many2one', relation='stock.location', string="Inventory Location", - view_load=True, domain=[('usage','like','inventory')], help="This stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory."), - 'property_stock_account_input': fields.property('account.account', - type='many2one', relation='account.account', - string='Stock Input Account', view_load=True, + 'property_stock_account_input': fields.property( + type='many2one', + relation='account.account', + string='Stock Input Account', help="When doing real-time inventory valuation, counterpart journal items for all incoming stock moves will be posted in this account, unless " "there is a specific valuation account set on the source location. When not set on the product, the one from the product category is used."), - 'property_stock_account_output': fields.property('account.account', - type='many2one', relation='account.account', - string='Stock Output Account', view_load=True, + 'property_stock_account_output': fields.property( + type='many2one', + relation='account.account', + string='Stock Output Account', help="When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless " "there is a specific valuation account set on the destination location. When not set on the product, the one from the product category is used."), 'sale_delay': fields.float('Customer Lead Time', help="The average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."), @@ -524,27 +520,29 @@ class product_category(osv.osv): _inherit = 'product.category' _columns = { - 'property_stock_journal': fields.property('account.journal', - relation='account.journal', type='many2one', - string='Stock Journal', view_load=True, + 'property_stock_journal': fields.property( + relation='account.journal', + type='many2one', + string='Stock Journal', help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."), - 'property_stock_account_input_categ': fields.property('account.account', - type='many2one', relation='account.account', - string='Stock Input Account', view_load=True, + 'property_stock_account_input_categ': fields.property( + type='many2one', + relation='account.account', + string='Stock Input Account', help="When doing real-time inventory valuation, counterpart journal items for all incoming stock moves will be posted in this account, unless " "there is a specific valuation account set on the source location. This is the default value for all products in this category. It " "can also directly be set on each product"), - 'property_stock_account_output_categ': fields.property('account.account', - type='many2one', relation='account.account', - string='Stock Output Account', view_load=True, + 'property_stock_account_output_categ': fields.property( + type='many2one', + relation='account.account', + string='Stock Output Account', help="When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless " "there is a specific valuation account set on the destination location. This is the default value for all products in this category. It " "can also directly be set on each product"), - 'property_stock_valuation_account_id': fields.property('account.account', + 'property_stock_valuation_account_id': fields.property( type='many2one', relation='account.account', string="Stock Valuation Account", - view_load=True, help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",), }