pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 8.0 up to cd44031

Browse Source
This commit is contained in:
Christophe Simonis
2016-11-25 12:23:13 +01:00
parent 9780551bb7 cd440312ce
commit b3944ed0a0
5 changed files with 78 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_bank_statement.py
+2 -1
View File
@@ -987,7 +987,8 @@ class account_bank_statement_line(osv.osv):
# Reconcile
for pair in move_line_pairs_to_reconcile:
aml_obj.reconcile_partial(cr, uid, pair, context=context)
# DO NOT FORWARD PORT
aml_obj.reconcile_partial(cr, uid, pair, context=dict(context, bs_move_id=move_id))
# FIXME : if it wasn't for the multicompany security settings in account_security.xml, the method would just
# return [('journal_entry_ids', '!=', True)]
addons/account/account_move_line.py
+24 -8
View File
@@ -1045,6 +1045,12 @@ class account_move_line(osv.osv):
if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
(account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
# DO NOT FORWARD PORT
if not writeoff_acc_id:
if writeoff > 0:
writeoff_acc_id = account.company_id.expense_currency_exchange_account_id.id
else:
writeoff_acc_id = account.company_id.income_currency_exchange_account_id.id
if not writeoff_acc_id:
raise UserError(_('You have to provide an account for the write off/exchange difference entry.'))
if writeoff > 0:
@@ -1098,14 +1104,24 @@ class account_move_line(osv.osv):
'amount_currency': amount_currency_writeoff and amount_currency_writeoff or (account.currency_id.id and currency or 0.0)
})
]
writeoff_move_id = move_obj.create(cr, uid, {
'period_id': writeoff_period_id,
'journal_id': writeoff_journal_id,
'date':date,
'state': 'draft',
'line_id': writeoff_lines
})
# DO NOT FORWARD PORT
# In some exceptional situations (partial payment from a bank statement in foreign
# currency), a write-off can be introduced at the very last moment due to currency
# conversion. We record it on the bank statement account move.
if context.get('bs_move_id'):
writeoff_move_id = context['bs_move_id']
for l in writeoff_lines:
self.create(cr, uid, dict(l[2], move_id=writeoff_move_id), dict(context, novalidate=True))
if not move_obj.validate(cr, uid, writeoff_move_id, context=context):
raise osv.except_osv(_('Error!'), _('You cannot validate a non-balanced entry.'))
else:
writeoff_move_id = move_obj.create(cr, uid, {
'period_id': writeoff_period_id,
'journal_id': writeoff_journal_id,
'date':date,
'state': 'draft',
'line_id': writeoff_lines
})
writeoff_line_ids = self.search(cr, uid, [('move_id', '=', writeoff_move_id), ('account_id', '=', account_id)])
if account_id == writeoff_acc_id:
addons/product/pricelist.py
+22 -2
View File
@@ -381,6 +381,14 @@ class product_pricelist(osv.osv):
class product_pricelist_version(osv.osv):
_name = "product.pricelist.version"
_description = "Pricelist Version"
def _get_product_pricelist(self, cr, uid, ids, context=None):
result = set()
for pricelist in self.pool['product.pricelist'].browse(cr, uid, ids, context=context):
for version_id in pricelist.version_id:
result.add(version_id.id)
return list(result)
_columns = {
'pricelist_id': fields.many2one('product.pricelist', 'Price List',
required=True, select=True, ondelete='cascade'),
@@ -394,7 +402,9 @@ class product_pricelist_version(osv.osv):
'date_start': fields.date('Start Date', help="First valid date for the version."),
'date_end': fields.date('End Date', help="Last valid date for the version."),
'company_id': fields.related('pricelist_id','company_id',type='many2one',
readonly=True, relation='res.company', string='Company', store=True)
readonly=True, relation='res.company', string='Company', store={
'product.pricelist': (_get_product_pricelist, ['company_id'], 20),
})
}
_defaults = {
'active': lambda *a: 1,
@@ -487,6 +497,14 @@ class product_pricelist_item(osv.osv):
return False
return True
def _get_product_pricelist(self, cr, uid, ids, context=None):
result = set()
for pricelist in self.pool['product.pricelist'].browse(cr, uid, ids, context=context):
for version_id in pricelist.version_id:
for item_id in version_id.items_id:
result.add(item_id.id)
return list(result)
_columns = {
'name': fields.char('Rule Name', help="Explicit rule name for this pricelist line."),
'price_version_id': fields.many2one('product.pricelist.version', 'Price List Version', required=True, select=True, ondelete='cascade'),
@@ -516,7 +534,9 @@ class product_pricelist_item(osv.osv):
'price_max_margin': fields.float('Max. Price Margin',
digits_compute= dp.get_precision('Product Price'), help='Specify the maximum amount of margin over the base price.'),
'company_id': fields.related('price_version_id','company_id',type='many2one',
readonly=True, relation='res.company', string='Company', store=True)
readonly=True, relation='res.company', string='Company', store={
'product.pricelist': (_get_product_pricelist, ['company_id'], 30),
})
}
_constraints = [
addons/sale/sale.py
+10 -1
View File
@@ -885,6 +885,13 @@ class sale_order_line(osv.osv):
res[line.id] = line.price_subtotal / line.product_uom_qty if line.product_uom_qty else 0.0
return res
def _get_sale_order(self, cr, uid, ids, context=None):
result = set()
for order in self.pool['sale.order'].browse(cr, uid, ids, context=context):
for line in order.order_line:
result.add(line.id)
return list(result)
_name = 'sale.order.line'
_description = 'Sales Order Line'
_columns = {
@@ -919,7 +926,9 @@ class sale_order_line(osv.osv):
\n* The \'Cancelled\' status is set when a user cancel the sales order related.'),
'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'),
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store={
'sale.order': (_get_sale_order, ['company_id'], 20),
}, readonly=True),
'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation and the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}),
'procurement_ids': fields.one2many('procurement.order', 'sale_line_id', 'Procurements'),
}
doc/cla/corporate/diagram-software.md
+20
View File
@@ -0,0 +1,20 @@
Spain, 2016-11-21
Diagram Software, S.L. agrees to the terms of the Odoo Corporate Contributor License
Agreement v1.0.
I declare that I am authorized and able to make this agreement and sign this
declaration.
Signed,
Jose Zambudio jose.zambudio@diagram.es https://github.com/zamberjo
List of contributors:
Cristian Moncho cristian.moncho@diagram.es https://github.com/crimoniv
Jose Zambudio jose.zambudio@diagram.es https://github.com/zamberjo
Almudena de la Puente almudena.delapuente@diagram.es https://github.com/almumu
Mauro Cebriá mauro.cebria@diagram.es https://github.com/maurochip
Pedro Albujer pedro.albujer.rico@diagram.es https://github.com/P4R
Rubén Cerdà ruben.cerda.roig@diagram.es https://github.com/rubencr7