Commit Graph

6045 Commits

Author SHA1 Message Date
Josse Colpaert d763f43878 [IMP] Correct js assets for barcode scanner
bzr revid: jco@openerp.com-20140505073931-mwikrhmngq1ju402
2014-05-05 09:39:31 +02:00
Josse Colpaert c60c1d1a72 [DEL] Delete boards
bzr revid: jco@openerp.com-20140502134701-lnoowskaqj9nsaof
2014-05-02 15:47:01 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Fabien Meghazi b7003a382a [MERGE] upstream
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Richard Mathot (OpenERP) 2c3ec2c7e4 [REM] mrp/stock: remmove ACLs related to removed dashboards
bzr revid: rim@openerp.com-20140429081808-hytvlkp461zm2l4o
2014-04-29 10:18:08 +02:00
Quentin (OpenERP) 7ed26f1e07 [REF] product refactoring: prices.history model renamed into product.price.history + passed 'date' as real parameter instead of contextual one in get_history_price() because it makes more sense.
bzr revid: qdp-launchpad@openerp.com-20140428153355-vbuam1hfnah7m4wp
2014-04-28 17:33:55 +02:00
Quentin (OpenERP) a4890f1fe2 [REF] stock: small code refactoring
bzr revid: qdp-launchpad@openerp.com-20140428145536-gt88h37nayf62fm3
2014-04-28 16:55:36 +02:00
Quentin (OpenERP) 606050aae3 [FIX] stock: fixed wrongly removed line from previous commit
bzr revid: qdp-launchpad@openerp.com-20140428100949-se3xpeix06udq1k2
2014-04-28 12:09:49 +02:00
Quentin (OpenERP) 9790132189 [REF] stock: small code refactoring
bzr revid: qdp-launchpad@openerp.com-20140428092726-1vo51if06q2o2b8y
2014-04-28 11:27:26 +02:00
Quentin (OpenERP) 599355ea69 [REF] stock: removal of TODO statements
bzr revid: qdp-launchpad@openerp.com-20140425142939-atjre88c9zvl5r93
2014-04-25 16:29:39 +02:00
Quentin (OpenERP) cba2365d95 [MERGE] branch of jco fixing shipping exception in mrp + cancellation in chained moves
bzr revid: qdp-launchpad@openerp.com-20140425132449-s7e8duh884rirrqz
2014-04-25 15:24:49 +02:00
Denis Ledoux 2832d2ddc9 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10016 revid:dle@openerp.com-20140425125507-njfyl1r6wn11vqwx
bzr revid: dle@openerp.com-20140425125926-5nchz1tcq4fx18jx
2014-04-25 14:59:26 +02:00
Quentin (OpenERP) 7a6b00b651 [MERGE] merged with trunk up to revision 9381
bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc
2014-04-25 11:04:14 +02:00
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Martin Trigaux f409aab12e [MERGE] [FIX] stock: add product_lot group on Traceability group as some parts of this group are restricted to this group and you can have production_lot without tracking_lot, courtesy of Mohammad Alhashash
lp bug: https://launchpad.net/bugs/1177076 fixed

bzr revid: mat@openerp.com-20140424152206-m4dnmee28w3yomsq
2014-04-24 17:22:06 +02:00
Quentin (OpenERP) f402240ade [MERGE] stock usability improvements
bzr revid: qdp-launchpad@openerp.com-20140424143838-a3so6ouc1q3la3ch
2014-04-24 16:38:38 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Christophe Simonis 52cfc16c2e [MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
bzr revid: chs@openerp.com-20140424123538-rxk9got9k2on1ki1
2014-04-24 14:35:38 +02:00
Josse Colpaert 7e733fcfaa [IMP] Do not check rule when cancelling procurement in propagation, works through stock move
bzr revid: jco@openerp.com-20140424091731-3ptkt7qr26i9ofnf
2014-04-24 11:17:31 +02:00
Launchpad Translations on behalf of openerp c7565cd540 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
2014-04-24 06:32:49 +00:00
Quentin (OpenERP) 2e7579c54d [MERGE] branch of jco with fix of orderpoint computation + small refactoring of action_cancel() of purchase.order
bzr revid: qdp-launchpad@openerp.com-20140423155557-t0gp3akhzb2y85cz
2014-04-23 17:55:57 +02:00
Josse Colpaert 5fea44967d [IMP] move act_window so it is known
bzr revid: jco@openerp.com-20140423152608-b6qg6r77mpejmzuu
2014-04-23 17:26:08 +02:00
Josse Colpaert 2b3ec22a26 [FIX] Correct the fact that moves have not been changed to cancel yet
bzr revid: jco@openerp.com-20140423151600-j9i3jhiyy3nzshvl
2014-04-23 17:16:00 +02:00
Martin Trigaux acc784cc99 [FIX] stock: pass the geven limit attribute in read_group call, courtesy of Guewen Baconnier
bzr revid: mat@openerp.com-20140423150621-rjiae83nxh5tqyau
2014-04-23 17:06:21 +02:00
Josse Colpaert 7a8222631e [IMP] Make sure the propagation of moves cancels procurements where necessary + manufacture and purchase cancel is not propagated by default
bzr revid: jco@openerp.com-20140423141700-60gbuxb4atp1z6ek
2014-04-23 16:17:00 +02:00
Martin Trigaux f613774606 [MERGE] [FIX] stock: fix error when executing a read_group on stock.picking.in and out, courtesy of Yannick Vaucher (Camptocamp)
bzr revid: mat@openerp.com-20140423132552-hpnr2skutqranvsj
2014-04-23 15:25:52 +02:00
Jaydeep Barot 19e4d1d6e2 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140422102821-hj5y7o835y80xx2e
bzr revid: jar@tinyerp.com-20140423114744-umaxpodiv3xlvh5s
2014-04-23 17:17:44 +05:30
Josse Colpaert 5807343602 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140423095528-h4dpd9gdmh8lmk6j
2014-04-23 11:55:28 +02:00
Quentin (OpenERP) d69f5e20ec [REF] stock: refactoring set active field on push and pull rules as a normal field (previously related on the route) as the route_id field is not required
bzr revid: qdp-launchpad@openerp.com-20140423082322-ms66ta8zq0uklw32
2014-04-23 10:23:22 +02:00
Launchpad Translations on behalf of openerp d64b172b3b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423065826-x7fmgc85ckhi9s8u
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423070300-k249yxs2ghd1vaof
2014-04-23 07:03:00 +00:00
Quentin (OpenERP) 6ccdde1f9b [FIX] stock: fixed warning (added an access right for stock.fixed.putaway.strat model)
bzr revid: qdp-launchpad@openerp.com-20140423065826-33w9xmzu662zpac3
2014-04-23 08:58:26 +02:00
Quentin (OpenERP) 11a2ac0976 [FIX] stock
bzr revid: qdp-launchpad@openerp.com-20140422202123-5axnua7uuk64zzwj
2014-04-22 22:21:23 +02:00
Denis Ledoux b6255eb55d [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
Quentin (OpenERP) 44f1f7f73e [MERGE] merged the branch of jco with simplification of negative quants treatment, using a list of fallback domains and recomputing the state of move if we took some quants that were preeviously reserved for something else
bzr revid: qdp-launchpad@openerp.com-20140422145954-89jfnqw34u703h98
2014-04-22 16:59:54 +02:00
Martin Trigaux aac1a81999 [MERGE] [FIX] stock: when duplicating a stock.move, remove serial number and tracking information in every cases instead of specific to duplication of invocies, courtesy of Guewen Baconnier
bzr revid: mat@openerp.com-20140422140337-ymq7x133eicy6rpa
2014-04-22 16:03:37 +02:00
Denis Ledoux 1306bd11ad [MERGE][FIX] *: typos fixes in modules manifest
bzr revid: dle@openerp.com-20140422130348-137yvk356pkv25im
2014-04-22 15:03:48 +02:00
Josse Colpaert ea456d4458 [IMP] Remove supply move created message
bzr revid: jco@openerp.com-20140422125945-ff769vzlw1hmh6au
2014-04-22 14:59:45 +02:00
Quentin (OpenERP) 5afa7d8aaf [REF] stock, stock_account: invoice_state field of push rule moved into the right module
bzr revid: qdp-launchpad@openerp.com-20140422124113-scgaooce0ofjawpk
2014-04-22 14:41:13 +02:00
Josse Colpaert f119c72f5b [IMP] Help messages for warehouse settings
bzr revid: jco@openerp.com-20140422123326-1fuwmkja041j34yn
2014-04-22 14:33:26 +02:00
Bharat Devnani (Open ERP) 3a0c820dfd [MERGE][IMP] More explicit error messages (in delivery, hr_timesheet_sheet, purchase, purchase_requisition, sale_stock, stock)
bzr revid: rim@openerp.com-20140422123022-22zef462lts0qyqi
2014-04-22 14:30:22 +02:00
Josse Colpaert e170312ef4 [IMP] Inventory button on location
bzr revid: jco@openerp.com-20140422121524-d8lrt55bcyftxqzr
2014-04-22 14:15:24 +02:00
Richard Mathot (OpenERP) 71560225a9 [MERGE] from trunk
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
2014-04-22 11:30:02 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365.
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Richard Mathot (OpenERP) 56038a3cf9 [IMP] views
bzr revid: rim@openerp.com-20140422092529-b2ked8791lqkumb0
2014-04-22 11:25:29 +02:00
Quentin (OpenERP) 182171267f [FIX] stock: procurement rule form view fixed
bzr revid: qdp-launchpad@openerp.com-20140422092018-8w3lpsnrutyjx0ca
2014-04-22 11:20:18 +02:00
Anael Closson e3ecf7f4d4 [FIX] en_US typos - opw 606919
bzr revid: acl@openerp.com-20140422085837-9flv9ksh54ymvv7i
2014-04-22 10:58:37 +02:00
Josse Colpaert a7d4e518ae [IMP] Action assign button on production order + quant_ids readonly on serial number
bzr revid: jco@openerp.com-20140422085831-yt7hdb3catb5w00q
2014-04-22 10:58:31 +02:00