On 02/25/2014 09:59 PM, Raphael Valyi wrote: > > Hello Stefan, sounds like a valid approach too. However I wonder if > that won't be quite much more work.
Hi Raphael, here is a proof-of-concept addons branch of my approach here: http://bazaar.launchpad.net/~therp-nl/openobject-addons/8.0-ocb_replay_of_ocb70_poc/changes. I used a customized version of replay_missing.py from lp:lp-community-utils that continues after conflicts (reverting of course) and ignores commits by trp-bzr-bot, assuming they are replays from upstream. 59 changes could be committed succesfully to a branch of lp:openobject-addons/trunk, while 37 gave conflicts. Below is a listing of both sets. Cheers, Stefan. === Success === http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8713: [FIX] l10n_nl: missing sequence on tax gives wrong default tax (Holger Brunn <hbr...@therp.nl>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8762: [IMP] account_financial_report: avoid display -0.0 also in comparison columns (stephane.bid...@acsone.eu) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8784: [FIX] lp:1089004, Add serial number popup layout broken in Firefox (h...@tinyerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8932: [MRG] [FIX] invoice due date is always recomputed (nicolas.be...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8973: [FIX] lp:1023047, don't attempt to write empty dict on timesheet line (hbr...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8974: [FIX] lp:1163832, sane defaults for email opt-out settings on partner (nicolas.be...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9064: [FIX] lp:1132963, Fix contract selection on payroll within date range (the.clone.mas...@gmail.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9121: [FIX] lp:1177348, context is not propagated through account_period's name_search to account_period.search (guewen.baconn...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9180: [FIX] lp:941817, taxes not computed automatically on proforma (ste...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9181: [FIX] Set tax code sequence from template (ste...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9197: [MRG] FIX] lp:1100427, 'Default debit-credit account' fields on the journal form view are not visible without horizontal scrolling (h...@tinyerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9211: [FIX] bug 1088412 internal pickings have no name (alexandre.fayo...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9214: [FIX] Add appropriate sequences to l10n_nl tax codes (ste...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9215: [ADD] added taxes templates in l10n_br module (renatonl...@gmail.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9216: [FIX] #1170916 : Suppliers created from Purchase Receipt should be created as supplier, not customer (qt-tempo-consulting) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9217: [FIX] project name search if aa id != project id (nbessi-c2c) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9272: [FIX] pin timezone to UTC for calculating durations (frederic.cleme...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9273: [FIX] sale - copy customer ref instead of order name in sale_line_invoice wizard (Yannick Vaucher) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9275: [FIX] _create_product_valuation_moves (stock.move) does not use context while creating account.move (lorenzo.battist...@agilebg.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9276: [MRG] [FIX] hr_timesheet_sheet: timesheet is stuck after removing an inside attendance entries so restricted deletion of inside entries if it does not follow the signin signout rule (Yannick Vaucher) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9280: [MRG] [FIX] don't include adjacent bom's products into check for recursion (closes lp:1155569) (hbr...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9296: [FIX] bug 1188593 name_search now support monthly and daily timesheet range (Nicolas Bessi - Camptocamp) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9312: [FIX] wrong display on picking list report : parasite boolean on column state when move lines are in draft/assigned states (romain.dehe...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9363: [FIX] delivery: propagate additional fields in chained pickings (alexandre.fayo...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9364: [FIX] hr_timesheet - details tab must be sorted by date (yannick.vauc...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9397: [FIX] account_invoice: set analytic account on taxes if there is no default and it is the same financial account than the invoice line. (stephane.bid...@acsone.eu) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9398: [IMP] account_budget: support view and consolidation children in budget positions (laurent.mig...@acsone.eu) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9406: [FIX] lp:1067541, bill task work selects wrong receivable account in multi-company context (laurent.mig...@acsone.eu) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9433: [FIX] return new resource id in copy() from partner (f...@tinyerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9434: [IMP] The general account is not mandatory in analytic account entries (l...@numerigraphe.fr) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9452: [FIX] analytic_user_function - wrong override of domain for account_id in timesheet lines (yvaucher-c2c) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9453: [FIX] hr_timesheet_sheet - redefine _check_sheet_state to make sure it controls the right timesheet_sheet to make sure it isn't possible to timesheet on a already confirmed or closed timesheet_sheet (yvaucher-c2c) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9454: [FIX] Aged partner balance unreconciled amount selection off by one day (ste...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9475: [IMP] Print aged partner balance on a selection of partners (srijnh...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9569: [IMP] lp:1203108/OPW595596, product: changed the position of active field from Procurement/Delay to Inventory/status Tab (h...@tinyerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9578: [FIX] inversed invoice_control value problem in stock_location addon (with chained picking setup) (r...@tinyerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9579: [FIX] action_stock_invoice_onshipping missing on stock.picking (h...@tinyerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9580: [FIX] add module name to xmlids used in context [ADD] tracability also visible for stock.group_production_lot (alhash...@centrivision.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9581: [FIX] hr_timesheet: amount on timesheet line not calculated as per as the cost price of the product (s...@openerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9599: [FIX] account - add a selection list on target_move in wizard for tax report (yannick.vauc...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9624: [FIX] fix test_20_message_post to take care of different notification_email_send default value in ocb (Christophe CHAUVET <christophe.chau...@syleam.fr>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9626: [IMP]Made parent account visible for analytic accounts with type 'Contract or Project' (Christophe CHAUVET <christophe.chau...@syleam.fr>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9640: [FIX] resolve conflict between http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9584 and http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9564 (hbr...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9649: [FIX] 500 error on connection when using PyWebDAV 0.9.4 (Holger Brunn <hbr...@therp.nl>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9666: [FIX] bug in test related to lp:1067541, hr_timesheet_invoice.test_multi_company (laurent.mig...@acsone.eu) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9730: [FIX] These changes set the correct account type to view accounts (lorenzo.battist...@agilebg.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9731: [RVT] Reverting OCB-specific email setting defaults linked to lp:1163832 (ste...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9732: [FIX] mrp: mrp.bom multi-company rule (pedro.ba...@serviciosbaeza.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9733: [FIX]sale_stock:property_ids added (kbh at tinyerp) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9833: [fix] the added new constraint for account (via OPW) (r...@tinyerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9841: [FIX] recurse into analytic account's children when calculating practical amount in budgets (hbr...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9863: [FIX] Avoid "Error The taxes have different rates" with non deductible VAT and l10n_it_partially_deductible_vat (lorenzo.battist...@agilebg.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9865: [FIX] avoid writing picking state if it has not changed (alexandre.fayo...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9890: [FIX] account_voucher: Refund payment: Error occurred while validating the field(s) amount_currency (lorenzo.battist...@agilebg.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9919: [MRG] fix partial delivery will copy tracking number in the backorder picking lp:1199858 port of https://code.launchpad.net/~camptocamp/openobject-addons/7.0-595239-opw-skh-afe/+merge/201002 to ocb (s...@openerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9940: add missing field in the view which breaks the bank statement yaml tests (leonardo.pist...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9947: [ADD] missing invalidation on fees [ADD] unit test for lp:1281687 (alexandre.fayo...@camptocamp.com) === Conflicts === http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8696: [FIX] report_webkit - change description for new webkit lib path parameter (yannick.vauc...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8752: [FIX] account_financial_report: use sign in comparison column (Holger Brunn <hbr...@therp.nl>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8819: [FIX] lp:1135873, pull linkedin-api from the protocol we're on (hbr...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8897: [MRG] Fix a missing context propagation in product/pricelist.py (closes: lp:1155624) (yannick.vauc...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8898: [MRG] [FIX] don't offer bogus reordering in mrp_bom_component_tree_view (closes: lp:1155581) (hbr...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9179: [FIX] pto in invoice and sale order template should not cover the whole document (ste...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9182: [MRG] adds active field on account.journal (nicolas.be...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9198: [MRG] crm improvements [IMP] lp:1179307-[7.0:addons/crm] add lead group in phonecall reporting [FIX] lp:1179305-[7.0:addons/crm] Fix direct link to phonecalls and meetings in lead view (cont...@invitu.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9210: [FIX] hardcoded default stock location unreadable by some users (alexandre.fayo...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9212: [FIX] report_webkit - using style in image helper instead of attributes, this allow to use metric dimensions for images [IMP] image helper to accept other units than px (yvaucher-c2c) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9213: [FIX] report_webkit - set exception message translatable (alexandre.fayo...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9274: [FIX] stock.picking: fix raw stock picking create which was broken by previous change (alexandre.fayo...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9341: [FIX] bug:1168398/Incorrect behaviour when producing MO with component split in serial numbers. (alexandre.fayo...@camptocamp.com,t...@openerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9367: [RVT] Reverse merge of revision 9210, containing Alexandre Fayolle's fix for lp:1182111 in order to resolve conflicts with similar fix in upstream branch (Stefan Rijnhart <ste...@therp.nl>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9405: [FIX] lp:1183741, project name_search does not search by project name (nicolas.be...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9435: [FIX] lp:1206167, Add journal type filter, to prevent to import unreconciled bank move line (yannick.vauc...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9455: [FIX] Show payment order line amount in tree view, payment order amount in form view (d...@openerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9459: [FIX] Fixes lp1103072 - Make survey module usable for external users Thanks to hol...@therp.nl (hol...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9472: [FIX] get current user's note stages when creating a new user to prevent access error (r...@openerp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9474: [FIX] Allow to cancel an expense (yannick.vauc...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9476: [FIX] Cannot create new warehouse (srijnh...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9570: [RVT] Revert revno. 9472 (lp:1156215) as this was fixed independently on upstream (Stefan Rijnhart <ste...@therp.nl>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9584: [MRG] fix the bug (https://bugs.launchpad.net/ocb-addons/+bug/1238525) related to the average price computation when using price on product form in other currency than the company one. * Fix the trouble in do_partial method to convert to proper currency once new average price computed * Adds test to avoid that in the future (joel.grandguilla...@camtptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9598: [FIX] ensure that move are directly in state done after beeing confirmed in order to fix propagation of chaining (nicolas.be...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9613: [FIX] search sheet_id for attendance using date in user's timezone. (yannick.vauc...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9617: [FIX] Fixed the issue of graph tooltip error while mouseover on Firefox, the error is producible only when base_import module installed, the error comes due to select2 library. (stephane.bid...@acsone.eu) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9623: [FIX] don't reset last action date on any write (Christophe CHAUVET <christophe.chau...@syleam.fr>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9625: [FIX] Providing double protection: prevent the risk of referencing an unassigned variable. Also passing the context from the test. Either of those make the test run. (Christophe CHAUVET <christophe.chau...@syleam.fr>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9627: [FIX] This is a port of the fix to have prices in manually added invoice lines originate from the partner's pricelist, if any. If there are no pricelists involved, nothing should change. (Christophe CHAUVET <christophe.chau...@syleam.fr>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9628: [FIX] Fix wrong warehouse reference in Purchase Order/Purchase Requisition, when generating PO/PR based on reordering rule (Christophe CHAUVET <christophe.chau...@syleam.fr>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9629: [FIX] revert MP lp:754339 (Christophe CHAUVET <christophe.chau...@syleam.fr>) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9729: [FIX] make the fields required for all type='contract' and type='template' (guewen.baconn...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9734: [MERGE] Resolve conflict in purchase and purchase_requirement between ocb-addons and openobject-addons. (hbr...@therp.nl) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9815: [FIX] int(base_calendar_id) can return an exception instead of false (h...@art-of-technology.ch) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9816: [FIX] action should return True (Dhruvit Darji(OpenERP Trainee)) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9864: [IMP] performance improvement on progress rate calculation in projects (matthieu.dietr...@camptocamp.com) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9943: [FIX] reduce the number of unnecessary calls to trg_write in cancel_assign (alexandre.fayo...@camptocamp.com) _______________________________________________ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp