odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] backport of trunk fixes to account, base_calendar, purchase, stock, stock_planning 

bzr revid: odo@openerp.com-20110120140214-2mj8xn3g3kddgjvb
This commit is contained in:
Olivier Dony 2011-01-20 15:02:14 +01:00
parent 9438842708
commit 20e94b74a5
8 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account.py
View File

@ -2616,7 +2616,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
chart_template_id = ids[0]
purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
, "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
return purchase_tax_ids[0]
return purchase_tax_ids and purchase_tax_ids[0] or False
return False
def _get_sale_tax(self, cr, uid, context=None):
@ -2625,7 +2625,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
chart_template_id = ids[0]
sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
, "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
return sale_tax_ids[0]
return sale_tax_ids and sale_tax_ids[0] or False
return False
def _get_chart(self, cr, uid, context=None):

4
addons/account/account_invoice_view.xml
View File

@ -190,6 +190,7 @@
<field name="tax_line" nolabel="1">
<tree editable="bottom" string="Taxes">
<field name="name"/>
<field name="account_id" groups="account.group_account_invoice"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
@ -284,7 +285,8 @@
<field name="tax_line" nolabel="1">
<tree editable="bottom" string="Taxes">
<field name="name"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<field name="account_id" groups="account.group_account_invoice"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
<field invisible="True" name="base_amount"/>
<field invisible="True" name="tax_amount"/>

8
addons/account/account_move_line.py
View File

@ -588,18 +588,10 @@ class account_move_line(osv.osv):
return False
return True
def _check_partner_id(self, cr, uid, ids, context=None):
lines = self.browse(cr, uid, ids, context=context)
for l in lines:
if l.account_id.type in ('receivable', 'payable') and not l.partner_id:
return False
return True
_constraints = [
(_check_no_view, 'You can not create move line on view account.', ['account_id']),
(_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
(_check_company_id, 'Company must be same for its related account and period.',['company_id'] ),
(_check_partner_id, 'You can not create move line on receivable/payable account without partner', ['account_id'] )
]
#TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id

6
addons/account/account_view.xml
View File

@ -421,8 +421,8 @@
<group col="2" colspan="2">
<group colspan="2" col="2">
<separator string="Accounts" colspan="4"/>
<field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group>
<group colspan="2" col="2">
<separator string="Journal View" colspan="4"/>
@ -2394,7 +2394,7 @@
<field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<newline/> <!-- extended view because the web UI is not good for one2many -->
<field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="base.group_extended">
<field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="base.group_extended">
<form string="Bank Information">
<field name="acc_name"/>
<field name="account_type"/>

9
addons/base_calendar/base_calendar.py
View File

@ -1751,7 +1751,14 @@ class ir_attachment(osv.osv):
new_args = args
for i, arg in enumerate(new_args):
if arg[0] == 'res_id':
new_args[i] = (arg[0], arg[1], base_calendar_id2real_id(arg[2]))
ids = arg[2]
if arg[1].lower() in ('in', 'not in'):
if not isinstance(ids, (tuple, list)):
ids = [ids]
ids = map(base_calendar_id2real_id, ids)
new_args[i] = (arg[0], arg[1], ids)
return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
limit=limit, order=order,
context=context, count=False)

2
addons/purchase/purchase.py
View File

@ -217,7 +217,7 @@ class purchase_order(osv.osv):
'company_id': fields.many2one('res.company','Company',required=True,select=1),
}
_defaults = {
'date_order': time.strftime('%Y-%m-%d'),
'date_order': lambda *a: time.strftime('%Y-%m-%d'),
'state': 'draft',
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
'shipped': 0,

4
addons/stock/stock.py
View File

@ -1593,7 +1593,9 @@ class stock_move(osv.osv):
except:
pass
if context.get('address_in_id', False):
return self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context).partner_id.property_stock_supplier.id
part_obj_add = self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context=context)
if part_obj_add.partner_id:
return part_obj_add.partner_id.property_stock_supplier.id
return False
_defaults = {

1
addons/stock_planning/wizard/stock_planning_forecast.py
View File

@ -20,6 +20,7 @@
##############################################################################
from osv import osv, fields
from tools.translate import _
# Creates forecasts records for products from selected Product Category for selected 'Warehouse - Period'
# Object added by contributor in ver 1.1