[Openerp-community-reviewer] [Merge] lp:~agilebg/account-consolidation/7.0-fix-1334645-elbati into lp:account-consolidation/7.0
Lorenzo Battistini - Agile BG has proposed merging
lp:~agilebg/account-consolidation/7.0-fix-1334645-elbati into
lp:account-consolidation/7.0.
Requested reviews:
Account Core Editors (account-core-editors)
Related bugs:
Bug #1334645 in Account - Consolidation: "account_parallel_currency: test
failure test/mapping_parallel_accounts.yml"
https://bugs.launchpad.net/account-consolidation/+bug/1334645
For more details, see:
https://code.launchpad.net/~agilebg/account-consolidation/7.0-fix-1334645-elbati/+merge/225266
--
https://code.launchpad.net/~agilebg/account-consolidation/7.0-fix-1334645-elbati/+merge/225266
Your team Account Core Editors is requested to review the proposed merge of
lp:~agilebg/account-consolidation/7.0-fix-1334645-elbati into
lp:account-consolidation/7.0.
=== modified file 'account_parallel_currency/account.py'
--- account_parallel_currency/account.py 2014-03-24 18:16:13 +
+++ account_parallel_currency/account.py 2014-07-02 07:17:41 +
@@ -455,8 +455,8 @@
for tax_code in self.browse(cr, SUPERUSER_ID, ids, context):
for parallel_company in tax_code.company_id.parallel_company_ids:
if not tax_code.parent_id:
-raise orm.except_orm(_('Error'),_('Tax code %s does not have parent')
-% tax_code.code)
+# can't do the mapping as it's based on parent tax code
+return True
existing_ids = self.search(cr, SUPERUSER_ID, [
('code', '=', tax_code.code),
('company_id', '=', parallel_company.id),
--
Mailing list: https://launchpad.net/~openerp-community-reviewer
Post to : openerp-community-reviewer@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community-reviewer
More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~factorlibre/account-invoicing/account-invoicing-fix-merge-7.0 into lp:account-invoicing
Hugo Santos (Factorlibre) has proposed merging
lp:~factorlibre/account-invoicing/account-invoicing-fix-merge-7.0 into
lp:account-invoicing.
Requested reviews:
Account Core Editors (account-core-editors)
For more details, see:
https://code.launchpad.net/~factorlibre/account-invoicing/account-invoicing-fix-merge-7.0/+merge/225271
UoS Maybe not defined in invoice line so is not possible to obtain the factor
from there. In that case factor must be 1.0 like when assigning
o_line['uom_factor']
--
https://code.launchpad.net/~factorlibre/account-invoicing/account-invoicing-fix-merge-7.0/+merge/225271
Your team Account Core Editors is requested to review the proposed merge of
lp:~factorlibre/account-invoicing/account-invoicing-fix-merge-7.0 into
lp:account-invoicing.
=== modified file 'account_invoice_merge/invoice.py'
--- account_invoice_merge/invoice.py 2014-03-19 12:17:03 +
+++ account_invoice_merge/invoice.py 2014-07-02 08:34:34 +
@@ -129,7 +129,8 @@
o_line = invoice_infos['invoice_line'].setdefault(line_key, {})
if o_line:
# merge the line with an existing line
-o_line['quantity'] += invoice_line.quantity * invoice_line.uos_id.factor / o_line['uom_factor']
+uos_factor = invoice_line.uos_id and invoice_line.uos_id.factor or 1.0
+o_line['quantity'] += invoice_line.quantity * uos_factor / o_line['uom_factor']
else:
# append a new "standalone" line
for field in ('quantity', 'uos_id'):
--
Mailing list: https://launchpad.net/~openerp-community-reviewer
Post to : openerp-community-reviewer@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community-reviewer
More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into lp:ocb-addons
The proposal to merge lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into lp:ocb-addons has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty/+merge/223929 -- https://code.launchpad.net/~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty/+merge/223929 Your team OpenERP Community Backports is requested to review the proposed merge of lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into lp:ocb-addons. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into lp:ocb-addons
Uh. still another mistake in this patch. Sorry, this is annoying for us too. Will post an updated patch. -- https://code.launchpad.net/~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty/+merge/223929 Your team OpenERP Community Backports is requested to review the proposed merge of lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into lp:ocb-addons. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message into lp:hr-timesheet
Lorenzo Battistini - Agile BG has proposed merging
lp:~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message
into lp:hr-timesheet.
Requested reviews:
HR Core Editors (hr-core-editors)
For more details, see:
https://code.launchpad.net/~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message/+merge/225275
--
https://code.launchpad.net/~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message/+merge/225275
Your team HR Core Editors is requested to review the proposed merge of
lp:~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message
into lp:hr-timesheet.
=== modified file 'hr_attendance_analysis/hr_attendance.py'
--- hr_attendance_analysis/hr_attendance.py 2014-05-21 22:04:08 +
+++ hr_attendance_analysis/hr_attendance.py 2014-07-02 08:57:12 +
@@ -75,16 +75,26 @@
def total_seconds(self, td):
return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
-def time_difference(self, float_start_time, float_end_time):
+def time_difference(
+self, float_start_time, float_end_time, attendance_id=False
+):
if float_compare(
float_end_time, float_start_time, precision_rounding=0.001
) == -1:
# that means a difference smaller than 0.36 milliseconds
+message = _('End time %s < start time %s') % (
+str(float_end_time), str(float_start_time)
+if attendance_id:
+message = _(
+'End time %s < start time %s (attendance ID: %s)'
+) % (
+str(float_end_time),
+str(float_start_time),
+str(attendance_id)
+)
raise orm.except_orm(
_('Error'),
-_('End time %s < start time %s') % (
-str(float_end_time), str(float_start_time)
-)
+message
)
delta = self.float_to_datetime(
float_end_time) - self.float_to_datetime(
@@ -329,9 +339,12 @@
res[attendance.id]['inside_calendar_duration'] = intervals_within * precision
# make difference using time in order to avoid rounding errors
# inside_calendar_duration can't be > duration
-res[attendance.id]['outside_calendar_duration'] = self.time_difference(
+res[attendance.id][
+'outside_calendar_duration'
+] = self.time_difference(
res[attendance.id]['inside_calendar_duration'],
-res[attendance.id]['duration'])
+res[attendance.id]['duration'],
+attendance_id = attendance.id)
if reference_calendar.overtime_rounding:
if res[attendance.id]['outside_calendar_duration']:
--
Mailing list: https://launchpad.net/~openerp-community-reviewer
Post to : openerp-community-reviewer@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community-reviewer
More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message into lp:hr-timesheet
The proposal to merge lp:~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message into lp:hr-timesheet has been updated. Description changed to: This allows, when time diff errors are raised, to identify the raising attendance For more details, see: https://code.launchpad.net/~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message/+merge/225275 -- https://code.launchpad.net/~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message/+merge/225275 Your team HR Core Editors is requested to review the proposed merge of lp:~agilebg/hr-timesheet/hr_attendance_analysis-imp-time_difference-message into lp:hr-timesheet. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into lp:ocb-addons
Equivalent branch proposed upstream here https://github.com/odoo/odoo/pull/651 -- https://code.launchpad.net/~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty/+merge/223929 Your team OpenERP Community Backports is requested to review the proposed merge of lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into lp:ocb-addons. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into lp:ocb-addons
Loïc Bellier - Numérigraphe has proposed merging
lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into lp:ocb-addons.
Requested reviews:
Lionel Sausin - Numérigraphe (lionel-sausin): co-author
Laetitia Gangloff (Acsone) (laetitia-gangloff)
OpenERP Community Backports (ocb)
Related bugs:
Bug #1229646 in OpenERP Community Backports (Addons): "Wizard "Fill
inventory" does not respect the UoM's precision at the end of the computation"
https://bugs.launchpad.net/ocb-addons/+bug/1229646
For more details, see:
https://code.launchpad.net/~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty/+merge/223929
In v7.0, when a Physical inventory is filled with the wizard, the quantity of
products is computed by summing all the stock moves, but it's not rounded to
the correct precision.
This can lead to tiny differences when validating the inventory.
Our previous patch work with v6.0, but not with v7.0 because _compute_qty_obj
function has been refactored.
This is the patch for v7.0.
--
https://code.launchpad.net/~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty/+merge/223929
Your team OpenERP Community Backports is requested to review the proposed merge
of lp:~numerigraphe-team/ocb-addons/7.0-fill_inventory_zero_qty into
lp:ocb-addons.
=== modified file 'stock/stock.py'
--- stock/stock.py 2014-06-18 14:06:14 +
+++ stock/stock.py 2014-07-02 08:53:30 +
@@ -2922,7 +2922,7 @@
# to perform the correct inventory corrections we need analyze stock location by
# location, never recursively, so we use a special context
product_context = dict(context, compute_child=False)
-
+uom_obj = self.pool['product.uom']
location_obj = self.pool.get('stock.location')
for inv in self.browse(cr, uid, ids, context=context):
move_ids = []
@@ -2931,6 +2931,8 @@
product_context.update(uom=line.product_uom.id, to_date=inv.date, date=inv.date, prodlot_id=line.prod_lot_id.id)
amount = location_obj._product_get(cr, uid, line.location_id.id, [pid], product_context)[pid]
change = line.product_qty - amount
+if abs(change) < uom_obj.browse(cr, uid, line.product_uom.id).rounding:
+continue
lot_id = line.prod_lot_id.id
if change:
location_id = line.product_id.property_stock_inventory.id
=== modified file 'stock/wizard/stock_fill_inventory.py'
--- stock/wizard/stock_fill_inventory.py 2014-06-20 14:27:46 +
+++ stock/wizard/stock_fill_inventory.py 2014-07-02 08:53:30 +
@@ -22,6 +22,7 @@
from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
from openerp.tools import mute_logger
+from product._common import rounding
class stock_fill_inventory(osv.osv_memory):
_name = "stock.fill.inventory"
@@ -116,20 +117,16 @@
lot_id = move.prodlot_id.id
prod_id = move.product_id.id
if move.location_dest_id.id != move.location_id.id:
-if move.location_dest_id.id == location:
-qty = uom_obj._compute_qty_obj(cr, uid, move.product_uom,move.product_qty, move.product_id.uom_id, context=local_context)
-else:
-qty = -uom_obj._compute_qty_obj(cr, uid, move.product_uom,move.product_qty, move.product_id.uom_id, context=local_context)
+qty = move.product_qty
+if move.product_uom.id != move.product_id.uom_id.id:
+qty = uom_obj._compute_qty_obj(cr, uid, move.product_uom, qty, move.product_id.uom_id, context=local_context)
+if move.location_dest_id.id != location:
+qty = -qty
if datas.get((prod_id, lot_id)):
qty += datas[(prod_id, lot_id)]['product_qty']
-# Floating point sum could introduce tiny rounding errors :
-# Use the UoM API for the rounding (same UoM in & out).
-qty = uom_obj._compute_qty_obj(cr, uid,
- move.product_id.uom_id, qty,
- move.product_id.uom_id)
datas[(prod_id, lot_id)] = {'product_id': prod_id, 'location_id': location, 'product_qty': qty, 'product_uom': move.product_id.uom_id.id, 'prod_lot_id': lot_id}
if datas:
@@ -141,6 +138,9 @@
for stock_move in res.values():
for stock_move_details in stock_move.values():
+# remove product with qty < to product uom rounding (rouding error computation)
+if abs(stock_move_details['product_qty']) < uom_obj.browse(cr, uid, stock_move_details['product_uom']).rounding:
+continue
s
Re: [Openerp-community-reviewer] [Merge] lp:~therp-nl/web-addons/7.0-web_tree_many2one_clickable into lp:web-addons
Review: Approve test Tested it and it is working -- https://code.launchpad.net/~therp-nl/web-addons/7.0-web_tree_many2one_clickable/+merge/217655 Your team Web-Addons Core Editors is subscribed to branch lp:web-addons. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~agilebg/sale-reports/7_fix_1315445 into lp:~sale-core-editors/sale-reports/7.0
Review: Resubmit moved on github This project is now hosted on https://github.com/OCA/sale-reports. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub -- https://code.launchpad.net/~agilebg/sale-reports/7_fix_1315445/+merge/223795 Your team OpenERP Community Reviewer/Maintainer is subscribed to branch lp:~sale-core-editors/sale-reports/7.0. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~serpentcs/sale-reports/sale-serpentcs into lp:~sale-core-editors/sale-reports/7.0
Review: Resubmit moved on github This project is now hosted on https://github.com/OCA/sale-reports. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub -- https://code.launchpad.net/~serpentcs/sale-reports/sale-serpentcs/+merge/190321 Your team OpenERP Community Reviewer/Maintainer is subscribed to branch lp:~sale-core-editors/sale-reports/7.0. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/report-print-send/7.0-no-lock-in-update-1308635-ls into lp:report-print-send
Review: Needs Fixing LGTM appart for the variable _ though we are not using translation here. -- https://code.launchpad.net/~numerigraphe-team/report-print-send/7.0-no-lock-in-update-1308635-ls/+merge/216353 Your team Report Printing and Sending Core Editors is subscribed to branch lp:report-print-send. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls into lp:report-print-send
Review: Approve code review, no test Thanks for the changes LGTM -- https://code.launchpad.net/~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls/+merge/219787 Your team Report Printing and Sending Core Editors is subscribed to branch lp:report-print-send. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls into lp:report-print-send
The proposal to merge lp:~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls into lp:report-print-send has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls/+merge/219787 -- https://code.launchpad.net/~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls/+merge/219787 Your team Report Printing and Sending Core Editors is subscribed to branch lp:report-print-send. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls into lp:report-print-send
The proposal to merge lp:~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls into lp:report-print-send has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls/+merge/219787 -- https://code.launchpad.net/~numerigraphe-team/report-print-send/7.0-improve-prefs-ui-ls/+merge/219787 Your team Report Printing and Sending Core Editors is subscribed to branch lp:report-print-send. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~bruno-bottacini/report-print-send/7.0-report_webkit_custom_paper_size into lp:~report-print-send-core-editors/report-print-send/7.0
Review: Resubmit moved on github This project is now hosted on https://github.com/OCA/report-print-send. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub -- https://code.launchpad.net/~bruno-bottacini/report-print-send/7.0-report_webkit_custom_paper_size/+merge/202892 Your team Report Printing and Sending Core Editors is subscribed to branch lp:~report-print-send-core-editors/report-print-send/7.0. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/report-print-send/7.0-no-lock-in-update-1308635-ls into lp:~report-print-send-core-editors/report-print-send/7.0
Review: Resubmit moved on github This project is now hosted on https://github.com/OCA/report-print-send. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub -- https://code.launchpad.net/~numerigraphe-team/report-print-send/7.0-no-lock-in-update-1308635-ls/+merge/216353 Your team Report Printing and Sending Core Editors is subscribed to branch lp:~report-print-send-core-editors/report-print-send/7.0. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~agilebg/carriers-deliveries/adding_delivery_optional_invoice_line_7 into lp:~stock-logistic-core-editors/carriers-deliveries/7.0
Hi Yannick, I migrated it to https://github.com/OCA/carrier-delivery/pull/4 Cheers. -- https://code.launchpad.net/~agilebg/carriers-deliveries/adding_delivery_optional_invoice_line_7/+merge/213867 Your team Stock and Logistic Core Editors is subscribed to branch lp:~stock-logistic-core-editors/carriers-deliveries/7.0. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
