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

[MERGE] forward port branch 10.0 up to aac9cd4ca8

Browse Source
This commit is contained in:
Christophe Simonis
2018-01-22 12:32:40 +01:00
parent 4887a75e2c aac9cd4ca8
commit 3d673b5900
7 changed files with 74 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/views/hr_expense_views.xml
+3 -3
View File
@@ -27,13 +27,13 @@
<field eval="25" name="priority"/>
<field name="arch" type="xml">
<form string="Expenses">
<header>
<header invisible="context.get('expense_adding_line')">
<button name="submit_expenses" states="draft" string="Submit to Manager" type="object" class="oe_highlight o_expense_submit"/>
<field name="state" widget="statusbar" statusbar_visible="draft,reported,done"/>
<button name="view_sheet" type="object" string="View Report" class="oe_highlight" attrs="{'invisible': [('state', '=','draft')]}"/>
</header>
<sheet>
<div class="oe_button_box">
<div class="oe_button_box" invisible="context.get('expense_adding_line')">
<button name="action_get_attachment_view"
class="oe_stat_button"
icon="fa-book"
@@ -454,7 +454,7 @@
<field name="account_move_id" invisible="1"/>
</group>
</group>
<field name="expense_line_ids" nolabel="1" widget="many2many" domain="[('state', '=', 'draft')]" options="{'not_delete': True}">
<field name="expense_line_ids" nolabel="1" widget="many2many" domain="[('state', '=', 'draft')]" options="{'not_delete': True}" context="{'expense_adding_line': True}">
<tree>
<field name="date"/>
<field name="name"/>
addons/payment_authorize/models/payment.py
+1 -1
View File
@@ -126,7 +126,7 @@ class PaymentAcquirerAuthorize(models.Model):
for field_name in mandatory_fields:
if not data.get(field_name):
error[field_name] = 'missing'
if data['cc_expiry'] and datetime.now().strftime('%y%M') > datetime.strptime(data['cc_expiry'], '%M / %y').strftime('%y%M'):
if data['cc_expiry'] and datetime.now().strftime('%y%m') > datetime.strptime(data['cc_expiry'], '%m / %y').strftime('%y%m'):
return False
return False if error else True
addons/purchase/models/purchase.py
+4 -4
View File
@@ -760,10 +760,10 @@ class PurchaseOrderLine(models.Model):
self.product_uom = self.product_id.uom_po_id or self.product_id.uom_id
result['domain'] = {'product_uom': [('category_id', '=', self.product_id.uom_id.category_id.id)]}
product_lang = self.product_id.with_context({
'lang': self.partner_id.lang,
'partner_id': self.partner_id.id,
})
product_lang = self.product_id.with_context(
lang=self.partner_id.lang,
partner_id=self.partner_id.id,
)
self.name = product_lang.display_name
if product_lang.description_purchase:
self.name += '\n' + product_lang.description_purchase
addons/web_editor/static/src/js/rte.js
+2 -1
View File
@@ -271,10 +271,11 @@ var RTE = Widget.extend({
* @param {DOM} target where the dom is changed is editable zone
*/
historyRecordUndo: function ($target, event, internal_history) {
$target = $($target);
var rng = range.create();
var $editable = $(rng && rng.sc).closest(".o_editable");
if (!rng || !$editable.length) {
$editable = $($target).closest(".o_editable");
$editable = $target.closest(".o_editable");
rng = range.create($target.closest("*")[0],0);
} else {
rng = $editable.data('range') || rng;
addons/web_editor/static/src/js/summernote.js
+48 -18
View File
@@ -886,37 +886,67 @@ range.WrappedRange.prototype.reRange = function (keep_end, isNotBreakable) {
return new range.WrappedRange(sc, so, ec, eo);
};
// isOnImg: judge whether range is an image node or not
/**
* Returns the image the range is in or matches (if any, false otherwise).
*
* @todo this implementation may not cover all corner cases but should do the
* trick for all reproductible ones
* @returns {DOMElement|boolean}
*/
range.WrappedRange.prototype.isOnImg = function () {
// If not a selection but a cursor position, just check if a point's
// ancestor is an image or not
if (this.sc === this.ec && this.so === this.eo) {
return dom.ancestor(this.sc, dom.isImg);
}
var startPoint = {node: this.sc, offset: this.so};
var endPoint = {node: this.ec, offset: this.eo};
var nb = 0;
var image;
var startPoint = {node: this.sc.childNodes.length && this.sc.childNodes[this.so] || this.sc};
startPoint.offset = startPoint.node === this.sc ? this.so : 0;
var endPoint = {node: this.ec.childNodes.length && this.ec.childNodes[this.eo] || this.ec};
endPoint.offset = endPoint.node === this.ec ? this.eo : 0;
if (dom.isImg(startPoint.node)) {
nb ++;
image = startPoint.node;
}
var textNode;
dom.walkPoint(startPoint, endPoint, function (point) {
if (!dom.isText(endPoint.node) && point.node === endPoint.node && point.offset === endPoint.offset) {
// If the element has children (not a text node and not empty node),
// the element cannot be considered as selected (these children will
// be processed to determine that)
if (dom.hasChildren(point.node)) {
return;
}
var node = point.node.childNodes.length && point.node.childNodes[point.offset] || point.node;
var offset = node === point.node ? point.offset : 0;
var isImg = dom.ancestor(node, dom.isImg);
if (!isImg && ((!dom.isBR(node) && !dom.isText(node)) || (offset && node.textContent.length !== offset && node.textContent.match(/\S|\u00A0/)))) {
// Check if an ancestor of the current point is an image
var pointImg = dom.ancestor(point.node, dom.isImg);
var isText = dom.isText(point.node);
// Check if a visible element is selected, i.e.
// - If an ancestor of the current is an image we did not see yet
// - If the point is not in a br or a text (so a node with no children)
// - If the point is in a non empty text node we already saw
if (pointImg ?
(image !== pointImg) :
((!dom.isBR(point.node) && !isText) || (textNode === point.node && point.node.textContent.match(/\S|\u00A0/)))) {
nb++;
}
if (isImg && image !== isImg) {
image = isImg;
nb ++;
// If an ancestor of the current point is an image, then save it as the
// image we are looking for
if (pointImg) {
image = pointImg;
}
// If the current point is a text node save it as the last text node
// seen (if we see it again, this might mean it is selected)
if (isText) {
textNode = point.node;
}
});
return nb === 1 && image;
};
range.WrappedRange.prototype.deleteContents = function (towrite) {
if (this.sc === this.ec && this.so === this.eo) {
return this;
}
var prevBP = dom.removeBetween(this.sc, this.so, this.ec, this.eo, towrite);
$(dom.node(prevBP.sc)).trigger("click"); // trigger click to disable and reanable editor and image handler
doc/cla/corporate/bas-solutions.md
-16
View File
@@ -1,16 +0,0 @@
Netherlands, 8-2-2015
BAS Solutions 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,
Erwin van der Ploeg erwin@bas-solutions.nl https://github.com/erwin-bas-solutions
List of contributors:
Erwin van der Ploeg erwin@bas-solutions.nl https://github.com/erwin-bas-solutions
Ruchir Shukla ruchir@bas-solutions.nl https://github.com/ruchir-bas-solutions
doc/cla/corporate/odooexperts.md
+16
View File
@@ -0,0 +1,16 @@
Netherlands, 18-1-2018
Odoo Experts 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,
Erwin van der Ploeg erwin@bas-solutions.nl https://github.com/erwin-bas-solutions
List of contributors:
Erwin van der Ploeg erwin@odooexperts.nl https://github.com/ploegvde
Yenthe Van Ginneken yenthe@odooexperts.nl https://github.com/Yenthe666