Commit Graph

85557 Commits

Author SHA1 Message Date
Martin Trigaux 3f869b47ce [FIX] lunch: fix security rule, user_id being a related field he may not be set yet at the creation
bzr revid: mat@openerp.com-20140425074018-wnrhgsavhmp91xjv
2014-04-25 09:40:18 +02:00
Atul Patel (OpenERP) 1fadb254d5 [FIX]: Fix months count in yearly salary details
bzr revid: atp@tinyerp.com-20140425073719-7nlk18wuoxx3s39o
2014-04-25 13:07:19 +05:30
Chirag Dodiya (OpenERP) 616c20a0f7 [MRG]Merge lp:openerp-web
bzr revid: cod@tinyerp.com-20140425061936-csz156gyzu0holkw
2014-04-25 11:49:36 +05:30
Jaydeep Barot 74e8fb0674 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140425055958-asoj1wc0pmv7mzds
2014-04-25 11:29:58 +05:30
Jaydeep Barot 9a52ef48ad [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140425055310-hpkcnigeptczdadl
2014-04-25 11:23:10 +05:30
Jaydeep Barot 24e6fd332a [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140425054902-ls149dxiu4kyxkj5
2014-04-25 11:19:02 +05:30
Atul Patel (OpenERP) be912b1d46 [FIX]: Add qweb xml into openerp.py file
bzr revid: atp@tinyerp.com-20140425042148-jkldr55vvxfrxnmy
2014-04-25 09:51:48 +05:30
Atul Patel (OpenERP) e2aa0707bb [FIX]: ADD formatLang function in date field. use h2 tag in report title.
bzr revid: atp@tinyerp.com-20140425041641-vk95pdxb8w3034ij
2014-04-25 09:46:41 +05:30
Antony Lesuisse 8522ae723c [REM] remove portal_project_long_term
bzr revid: al@openerp.com-20140425001928-pacmyw9dfanmczvt
2014-04-25 02:19:28 +02:00
Antony Lesuisse 95a9bccb38 [REM] move project_long_term to extra
bzr revid: al@openerp.com-20140424235254-u2um2dsth6igvb7r
2014-04-25 01:52:54 +02:00
Antony Lesuisse dfa56e6b54 [REM] move auditrail to extra
It's deprecated by _track_fields, mail.message and base_action_rules

bzr revid: al@openerp.com-20140424232348-sn1oijj604uz6aen
2014-04-25 01:23:48 +02:00
Antony Lesuisse fb4507386d [REM] project_gtd deprecated by notes
bzr revid: al@openerp.com-20140424230801-zmzp2byyk41e7uxf
2014-04-25 01:08:01 +02:00
Fabien Meghazi 403e991b2e [FIX] Fix web test with temporary hack
bzr revid: fme@openerp.com-20140424212826-k8amd45orv33u8bn
2014-04-24 23:28:26 +02:00
Fabien Meghazi aca0ad4b8f [FIX] crm_partner_assign missing js file
bzr revid: fme@openerp.com-20140424212415-s843tzw826a992n9
2014-04-24 23:24:15 +02:00
Olivier Dony 95abee7579 [IMP] auth_signup: better autofocus handling
bzr revid: odo@openerp.com-20140424174842-5zzos30cq0jdu9w6
2014-04-24 19:48:42 +02:00
Fabien Meghazi 87d4c03ee2 [FIX] view's filename error
bzr revid: fme@openerp.com-20140424174135-cm61dogh9pterp77
2014-04-24 19:41:35 +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
Frédéric van der Essen f3da22c067 [IMP] point_of_sale, hw_scale: first commit for the hw_scale module, which handles scale connections for the POS
bzr revid: fva@openerp.com-20140424171259-hi9ma6w0fkdfrqnv
2014-04-24 19:12:59 +02:00
Fabien Meghazi 560ac34295 [IMP] bundlify rest of web addons
bzr revid: fme@openerp.com-20140424165735-83jty3iyrslci1q0
2014-04-24 18:57:35 +02:00
Fabien Meghazi 75408134f9 [REM] Removed js and css manifest keys from base
bzr revid: fme@openerp.com-20140424165659-qzhryvgp8vmo1ssd
2014-04-24 18:56:59 +02:00
Sunil Sharma (OpenERP) 0b2467833a [MERGE]: Merged hr yearly salary details report.
bzr revid: atp@tinyerp.com-20140424164100-1e90drhti5595cr7
2014-04-24 22:11:00 +05:30
Olivier Dony be6bef3c59 [FIX] auth_signup: avoid losing direct query string params during when switching between signup/signin/reset
bzr revid: odo@openerp.com-20140424162401-qtnopdtfdkfa1zxa
2014-04-24 18:24:01 +02:00
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
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
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
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
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
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
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
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