Commit Graph
103218 Commits
Author SHA1 Message Date
Martin Trigaux 10d3dd4ec3 [FIX] update to latest version saas code with updated underscore lib
bzr revid: mat@openerp.com-20140424160833-p0uf6zzst0pnj3i7
2014-04-24 18:08:33 +02:00
Fabien Meghazi 026fce99ab [FIX?] web_tests shall depends on 'web', right ?
bzr revid: fme@openerp.com-20140424155814-1hq0z4ea38a5gee9
2014-04-24 17:58:14 +02:00
Denis Ledoux a28832dc62 [FIX] sale_stock: recreate delivery order generates only the remaining products to deliver
Like it should do, the feature was broken
Moreover, it resolves a performance issue (do with 100 lines took up to 10 minutes)

bzr revid: dle@openerp.com-20140424155141-qtp5o5nrp0whlk9t
2014-04-24 17:51:41 +02:00
Sunil Sharma (OpenERP) 1c6b63a96e [MERGE]: Merged with qweb-report branch.
bzr revid: atp@tinyerp.com-20140424154553-3yk05u7chmc94odd
2014-04-24 21:15:53 +05:30
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
Denis Ledoux 3eb4fa3bac [FIX] website_sale: taxes must be taken from the product_id_change method
So they are computed with the partner, fiscal_position, etc

bzr revid: dle@openerp.com-20140424151605-81t7v9pc2rou17s3
2014-04-24 17:16:05 +02:00
Cedric Snauwaert fd986acc3d [FIX]dashboard: change layout correct use of modal object
bzr revid: csn@openerp.com-20140424150255-77emom1swsfry72h
2014-04-24 17:02:55 +02:00
Simon Lejeune cebd89c148 [FIX] QWeb contact widget: fixed double escaping: only the address part needs to be escaped as it is shown in a t-raw (other parts are shown in t-esc).
bzr revid: sle@openerp.com-20140424144329-vj51bt0y269f1pwo
2014-04-24 16:43:29 +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
Martin Trigaux 34067a1f49 [FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet
lp bug: https://launchpad.net/bugs/1180769 fixed

bzr revid: mat@openerp.com-20140424142829-ramy830hwkghk1jv
2014-04-24 16:28:29 +02:00
chm@openerp.com 13469c23d8 [MERGE] from trunk
bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy
2014-04-24 15:58:41 +02:00
Denis Ledoux be43d5bdfd [FIX] http: set back the gen_session_id controller, because still used by openframework.js of web branch
Related to revision 5124 revid:al@openerp.com-20140316141311-m0xqh386ax952va1

bzr revid: dle@openerp.com-20140424135507-5130yyy5brpfqd5f
2014-04-24 15:55:07 +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
Quentin (OpenERP) 387e6fbb0e [MERGE] module to manage the landed costs
bzr revid: qdp-launchpad@openerp.com-20140424133710-fjrgyx32xt6d4kfw
2014-04-24 15:37:10 +02:00
Quentin (OpenERP) 09bc7c923a [REF] stock_landed_costs: refactoring/improvements/fixes made during code review
bzr revid: qdp-launchpad@openerp.com-20140424133518-nqi1sxggetaum72r
2014-04-24 15:35:18 +02:00
DJ Patel c0d45ba62f [FIX] stock_landed_costs : Added a button to cancel the landed cost.
bzr revid: mdi@tinyerp.com-20140424133030-bxj3x4au976suj36
2014-04-24 19:00:30 +05:30
Quentin (OpenERP) f71e545f65 [FIX] stock_landed_costs: do not recompute the landed cost at each write
bzr revid: qdp-launchpad@openerp.com-20140424132020-mju7xq3g5c4j4j3r
2014-04-24 15:20:20 +02:00
Quentin (OpenERP) 76a96723a2 [FIX] stock_landed_costs: qty and volume computation
bzr revid: qdp-launchpad@openerp.com-20140424131510-hx55angkbe6jh4um
2014-04-24 15:15:10 +02:00
Olivier Dony 96b9d8b9d5 [FIX] mass_mailing: avoid using werkzeug API only present in 0.9+
bzr revid: odo@openerp.com-20140424131451-rhtokro13piol7ji
2014-04-24 15:14:51 +02:00
Olivier Dony 3ad6d69b21 [FIX] website: avoid using werkzeug API only present in 0.9+
bzr revid: odo@openerp.com-20140424131415-ot0r5062wndvuicr
2014-04-24 15:14:15 +02:00
Christophe Simonis c16780df83 [MERGE] forward port of branch saas-3 up to revid 5120 chs@openerp.com-20140424125338-26k5atvtqwmmfv4e
bzr revid: chs@openerp.com-20140424131405-4oannh1102x42m8b
2014-04-24 15:14:05 +02:00
Quentin (OpenERP) 5183909ade [REF] stock_landed_costs usability imp
bzr revid: qdp-launchpad@openerp.com-20140424130846-6348yoos4omernli
2014-04-24 15:08:46 +02:00
DJ Patel f5a285267c [FIX] stock_landed_costs : Automatic computation of landed cost when we save the record.
bzr revid: mdi@tinyerp.com-20140424130403-3tqm8okdqwgzkm73
2014-04-24 18:34:03 +05:30
Christophe Simonis e59aecca94 [MERGE] forward port of branch 7.0 up to revid 5288 mat@openerp.com-20140423150215-578nzug1glccvpwy
bzr revid: chs@openerp.com-20140424125338-26k5atvtqwmmfv4e
2014-04-24 14:53:38 +02:00
chm@openerp.com 90d0139ae1 [FIX] website tour: must retry running tour because in test mode some files are added after the first running try
bzr revid: chm@openerp.com-20140424124703-qeft3n8xjmb1mvxn
2014-04-24 14:47:03 +02:00
Simon Lejeune b667f6a292 [MERGE] trunk
bzr revid: sle@openerp.com-20140422124030-gowf9zyx1d36j01g
bzr revid: sle@openerp.com-20140424124655-95ex30m25soiu4wd
2014-04-24 14:46:55 +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
Fabien Meghazi 98302fca76 [REM] Removed globs from manifest in order to automate bundlification
bzr revid: fme@openerp.com-20140424122621-1smlpr1r7izuw369
2014-04-24 14:26:21 +02:00
Kersten Jeremy 7994fe09a3 [FIX] Calendar - only try to split the virtual id if it's a string
bzr revid: jke@openerp.com-20140424121118-t5rgqssf7mnr6bax
2014-04-24 14:11:18 +02:00
Sunil Sharma (OpenERP) 1e81e20cca [IMP]: Change function condition.
bzr revid: atp@tinyerp.com-20140424120202-jqbkr72y1a43dbpf
2014-04-24 17:32:02 +05:30
Martin Trigaux f73907587b [FIX] gamification: do not set a start_date by default as the cron starts past challenges (making data challenge to start) and avoid useless write
bzr revid: mat@openerp.com-20140424110341-pnu79q44m7gzl8t0
2014-04-24 13:03:41 +02:00
Sunil Sharma e5c1bf06a2 [imp]:remove br or text-center class then improve h2 or p tag
bzr revid: ssh@tinyerp.com-20140424105005-bcg7ynx571h25w3w
2014-04-24 16:20:05 +05:30
Quentin (OpenERP) 301b9a70eb [IMP] stock_landed_cost: functional review of the module.
bzr revid: qdp-launchpad@openerp.com-20140424103752-w12z1frkuujotnrb
2014-04-24 12:37:52 +02:00
DJ Patel 5f4876e7be [FIX] stock_landed_costs : You cannot validate a landed cost which has no valuation line.
bzr revid: mdi@tinyerp.com-20140424121656-8wb2mefhh7ons92d
2014-04-24 17:46:56 +05:30
DJ Patel d0fc220091 [ADD] stock_landed_costs : Added the access rights.
bzr revid: mdi@tinyerp.com-20140424114017-faura7ny873msnlc
2014-04-24 17:10:17 +05:30
DJ Patel a4eef5f17e [IMP] stock_landed_costs : Total field should be above the compute button.
bzr revid: mdi@tinyerp.com-20140424104022-h88ujot6kmklbo6e
2014-04-24 16:10:22 +05:30
Thibault Delavallée ca63094542 [MERGE] [FIX] email_template: effectively support 'user signature'
in the mail composer when using templates.

bzr revid: tde@openerp.com-20140424102801-j1qbqdvbyo9wv48e
2014-04-24 12:28:01 +02:00
DJ Patel 7e700e4554 [FIX] stock_landed_costs : Fixed the cost price of related quant.
bzr revid: mdi@tinyerp.com-20140424102431-llaqwn80mfp1j3h6
2014-04-24 15:54:31 +05:30
Jaydeep Barot (OpenERP) 9cb2b91783 [MERGE][IMP] account: allow sorting of journal items
bzr revid: rim@openerp.com-20140424101453-isbgyj5av17rssq2
2014-04-24 12:14:53 +02:00
Kersten Jeremy 1a4177d777 [FIX] Calendar - Override _name_search to convert virtual_id to real_id
bzr revid: jke@openerp.com-20140424101036-1twaii8oj70e4fx5
2014-04-24 12:10:36 +02:00
Rakesh Sindhav (OpenERP) 58036602f7 [MERGE]l10n_in_hr_payroll: Merged payslip details report
bzr revid: atp@tinyerp.com-20140424101031-ufuqhtxvo99dmwnr
2014-04-24 15:40:31 +05:30
DJ Patel d626d770bf [ADD] stock_landed_costs : Added the openchatter notification system.
bzr revid: mdi@tinyerp.com-20140424100337-fbcyr73fjbj5gecw
2014-04-24 15:33:37 +05:30
Rakesh Sindhav (OpenERP) 2949a395ba [IMP]: set the header to left side
bzr revid: rsi@tinyerp.com-20140424100150-0as1tmhipxo8tfdn
2014-04-24 15:31:50 +05:30
Dharti Ratani (Open ERP) e55c51fe40 [FIX]Fixed the issue of no audit logs for an object for which audittrail rule is created with Log Read as true 2014-04-24 15:24:29 +05:30
Josse Colpaert d958ce968e [IMP] Make sure tests of stock_dropshipping also pass without procurement_jit
bzr revid: jco@openerp.com-20140424095347-xcqj0m4oxilroxhk
2014-04-24 11:53:47 +02:00
Fabien Meghazi c304c5a80b [REM] useless manifest declaration
bzr revid: fme@openerp.com-20140424094155-2iatlo8twy5dcb3f
2014-04-24 11:41:55 +02:00
Simon Lejeune 5c69f3470d [FIX] hr_attendance: removed useless xsl
bzr revid: sle@openerp.com-20140424093800-cn3rtga12qk4g7wx
2014-04-24 11:38:00 +02:00
Josse Colpaert bf5585851a [IMP] Make sure tests pass without procurement_jit installation
bzr revid: jco@openerp.com-20140424093654-r04xvcp544du1lkj
2014-04-24 11:36:54 +02:00
Simon Lejeune 0f869fd64b [MERGE] trunk
bzr revid: sle@openerp.com-20140424093103-pekfio3gv2s721ro
2014-04-24 11:31:03 +02:00
Simon Lejeune d2765da09c [FIX] hr_attendance: menuitem wording
bzr revid: sle@openerp.com-20140424093052-eq0llqvty1s4bjf1
2014-04-24 11:30:52 +02:00