Commit Graph
81391 Commits
Author SHA1 Message Date
Launchpad Translations on behalf of openerp fb7a497ff0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140114055838-31j3saw3pdlwevp1
2014-01-14 05:58:38 +00:00
jke-openerp 8fbc5b159d [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20140113193949-39t5hssln2u5s899
2014-01-13 20:39:49 +01:00
jke-openerp facb8547db [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20140113193830-igvzvf8gsic5okm8
2014-01-13 20:38:30 +01:00
jke-openerp 41706f1ab5 [REF] Add missing import for uuid
bzr revid: jke@openerp.com-20140113193121-dafln7ygtzy6415s
2014-01-13 20:31:21 +01:00
Thibault Delavallée 4ec71cd82b [ADD] website_mail: template designer: added some snippets for template design
bzr revid: tde@openerp.com-20140113180051-dqtzzn9mrya0ythq
2014-01-13 19:00:51 +01:00
jke-openerp 5626a5a391 [REF] Removing the quick create overriding for hr_holiday - that was a test/sample not used
bzr revid: jke@openerp.com-20140113174701-nmvtarylf19d63nx
2014-01-13 18:47:01 +01:00
jke-openerp f9b6ff0760 [REF] Refactoring according to the review of CHS
bzr revid: jke@openerp.com-20140113174338-4fkx4zs8cw6k20y3
2014-01-13 18:43:38 +01:00
jke-openerp c5791441c4 [REF] Refactoring according to CHS and AL review
bzr revid: jke@openerp.com-20140113174157-ins4vf57g0p6v82u
2014-01-13 18:41:57 +01:00
Fabien Meghazi 75e02860c2 [REM] Removed Login from webclient
bzr revid: fme@openerp.com-20140113173808-1clqlztx6fs79h2k
2014-01-13 18:38:08 +01:00
Fabien Meghazi 3f34405c7c [IMP] login user at db creation
bzr revid: fme@openerp.com-20140113173643-ire4cnb2nbxhs8dh
2014-01-13 18:36:43 +01:00
Christophe Matthieu a02797b26b [FIX] base.language.install remove explicit access access_base_language_install_group_user
bzr revid: chm@openerp.com-20140113173509-4syed8md6drifv2q
2014-01-13 18:35:09 +01:00
Martin Trigaux c2da410014 [FIX] kanban: format aggregates values to float to avoid too long numbers in kanban column
bzr revid: mat@openerp.com-20140113172623-yuqjbhcsdxjq82rw
2014-01-13 18:26:23 +01:00
Fabien Meghazi b7450672c0 [IMP] Always allow /web/session/logout even if not logged in
bzr revid: fme@openerp.com-20140113171312-sf2erlwby1kpw3a6
2014-01-13 18:13:12 +01:00
Thibault Delavallée fe0af74eab [REV] Reverted last commit.
bzr revid: tde@openerp.com-20140113165423-8nu3838d4yj3h3j4
2014-01-13 17:54:23 +01:00
Stephane Wirtel bfe20de386 [FIX] project_timesheet: supply_method is implemented in the module
'procurement' but this one is not in the dependencies of project_timesheet.

bzr revid: stw@openerp.com-20140113162901-0ykp7nlrxdiydmv5
2014-01-13 17:29:01 +01:00
Stephane Wirtel e091efecb8 [FIX] hr_holidays: Use osv.except_osv instead exceptions.Warning, because
Warning does not inherit from osv.except_osv and this exception is not catched
by the system.

bzr revid: stw@openerp.com-20140113162727-5au3iimfz4d1mszw
2014-01-13 17:27:27 +01:00
Stephane Wirtel 9c92ed7afb [MERGE] orm: Don't call the sequence when we create a new record. Use the
returning keyword of the INSERT statement.

bzr revid: stw@openerp.com-20140113153359-3a9w0thdpxp2aqb2
2014-01-13 16:33:59 +01:00
Stephane Wirtel dfe775ba1e [IMP] orm: Use a list of tuples instead of three collections.
bzr revid: stw@openerp.com-20140113153124-8921v1010xeuqeb8
2014-01-13 16:31:24 +01:00
Fabien Meghazi bbfae00dde [FIX] remove Login usage from edi module
bzr revid: fme@openerp.com-20140113152410-p32djnzq80xgh0o7
2014-01-13 16:24:10 +01:00
Fabien Meghazi 90ee743755 [FIX] remove login overload from web_hello module
bzr revid: fme@openerp.com-20140113152330-hcz8nndr3gfxkx2o
2014-01-13 16:23:30 +01:00
Gery Debongnie 4d550e963e [FIX] fixes some issues with chart drawing in graph view (addon web_graph)
bzr revid: ged@openerp.com-20140113152316-4i3endkgu10jmxgc
2014-01-13 16:23:16 +01:00
Christophe Matthieu 9987b9a858 [FIX] website_blog: Customize: Blog Category
bzr revid: chm@openerp.com-20140113152038-rrc3x3sfcjoppvvk
2014-01-13 16:20:38 +01:00
Christophe Matthieu 74c9840476 [FIX] website_blog: Customize: Authors
bzr revid: chm@openerp.com-20140113151708-gyii0v2gg3ljxwcp
2014-01-13 16:17:08 +01:00
Denis Ledoux 1478317986 [FIX] mass_mailing, marketing: menus displayed to employees only (no portal/anonymous). ACL change too.
bzr revid: dle@openerp.com-20140113151018-5xksff08s0vrjh8d
2014-01-13 16:10:18 +01:00
Christophe Matthieu cf15dfb490 [FIX] website_blog: Customize: Author
bzr revid: chm@openerp.com-20140113150859-cmj22j72syvosmmg
2014-01-13 16:08:59 +01:00
Fabien Meghazi 4c4755ffae [ADD] redirect option to /web/login
bzr revid: fme@openerp.com-20140113143702-20j30wc3wuglp3mn
2014-01-13 15:37:02 +01:00
Gery Debongnie be0da788f6 [MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140113110402-t4hmjl1vdqt91qx6
bzr revid: ged@openerp.com-20140113142408-12i6pqw1cbdqhqg2
2014-01-13 15:24:08 +01:00
Martin Trigaux a75ec87028 [MERGE] [FIX] account: accounting periods in demo data are no longer opening periods, create a new period_0 as opening period
bzr revid: mat@openerp.com-20140113140646-aa0wh2ixmkx2f6cq
2014-01-13 15:06:46 +01:00
Thibault Delavallée cbbe82a4a1 [MERGE] Sync with main website-al branch
bzr revid: tde@openerp.com-20140113134937-kijvjjne6grov61c
2014-01-13 14:49:37 +01:00
Gery Debongnie e2bb629c3c [IMP] adds support for various intervals when grouping by date in graph view (addon web_graph)
bzr revid: ged@openerp.com-20140113133800-3n1hi5ajpioktr3d
2014-01-13 14:38:00 +01:00
Gery Debongnie fcf97a559a [IMP] adds support for week/quarter groupby in readgroup method (orm.py)
bzr revid: ged@openerp.com-20140113133602-ytxleg91bu3fyx62
2014-01-13 14:36:02 +01:00
Turkesh Patel (Open ERP) 04703c9e15 [ADD] added account_product_template module and add it account configuration view
bzr revid: tpa@tinyerp.com-20140113131845-urfw5knjkou0a0aw
2014-01-13 18:48:45 +05:30
Thibault Delavallée b97727701c [IMP] [ADD] website: added base for template designer.
[ADD] website: email_template: added website_link field, a link to edit the template
directly in the website
[ADD] website_mail: added controller and page to edit templates. They are still jinja
templates editable in the website. Not qweb templates.
[ADD] website_mail: JS file and editor override to enable only certain snippets. Those
are still to add, but will be base templates for email.
[IMP] website: improved the addition of editor JS in the template header to be able
to add JS file that override the editor without having to hack everything in the
template.

bzr revid: tde@openerp.com-20140113125534-djy48pi7lf42f9ms
2014-01-13 13:55:34 +01:00
Frédéric van der Essen 539ebab188 [FIX] hw_escpos: last commit didn't work as intended, reverting changes
bzr revid: fva@openerp.com-20140113125325-9bodx8qrc0q7qgca
2014-01-13 13:53:25 +01:00
Martin Trigaux 1f163f5a78 [FIX] account: demo opening period, add x in the name
bzr revid: mat@openerp.com-20140113122917-zszm18ywrel1ie68
2014-01-13 13:29:17 +01:00
Denis Ledoux 9a93675d2d [FIX] project: projects_ids default value must be an array or none, not a lonely integer
bzr revid: dle@openerp.com-20140113113015-fobrv940bjhw1g7z
2014-01-13 12:30:15 +01:00
ddm@openerp.com f319a68196 [IMP] requestd by fp: load correct HTML template
bzr revid: ddm@openerp.com-20140113112514-qg43scqeryaha4nf
2014-01-13 12:25:14 +01:00
Martin Trigaux 7078d1c36a [MERGE] sync with trunk
bzr revid: mat@openerp.com-20140113112336-1dg6zz86g24yiicq
2014-01-13 12:23:36 +01:00
Frédéric van der Essen 6df89aa77a [FIX] adding new python dependencies brought by the hw_escpos module to the install script
bzr revid: fva@openerp.com-20140113111705-649g7wknkb10u6re
2014-01-13 12:17:05 +01:00
Frédéric van der Essen a8262eb44f [FIX] hw_escpos: use pip module name for external dependencies
bzr revid: fva@openerp.com-20140113110705-3qob6gdpir3f3rfb
2014-01-13 12:07:05 +01:00
Christophe Matthieu f927506bfc [FIX] website_mail: follow/subscribe button
bzr revid: chm@openerp.com-20140113110542-jkb13xfiy3tno50n
2014-01-13 12:05:42 +01:00
Martin Trigaux e0f4c59f11 [FIX] account: accounting periods in demo data are no longer opening periods, create a new period_0 as opening period
bzr revid: mat@openerp.com-20140113105555-nuefln1bajgwexpd
2014-01-13 11:55:55 +01:00
Frédéric van der Essen 8a43a64250 [MERGE] better management for python dependencies of the hardware driver modules
bzr revid: fva@openerp.com-20140113105447-4ylwptc139oho2m6
2014-01-13 11:54:47 +01:00
Frédéric van der Essen 310807b286 [MERGE] from trunk
bzr revid: fva@openerp.com-20140113105344-285tkvqrnmza0awn
2014-01-13 11:53:44 +01:00
Mahendra Barad (OpenERP) 6b90f0a6d5 [IMP]fix typo and improved layout
bzr revid: mba@tinyerp.com-20140113103617-vu9hftagrqx0dqa2
2014-01-13 16:06:17 +05:30
Martin Trigaux fb6f7b406d [IMP] project: remove duplicated field complete_name (already present in account.analytic.account)
bzr revid: mat@openerp.com-20140113103245-md9rl0hsym79abdq
2014-01-13 11:32:45 +01:00
Frédéric van der Essen 0b580af49b [FIX] hw_scanner: made evdev dependency optional (obviously it won't work if it's not installed...)
bzr revid: fva@openerp.com-20140113103148-2uvhd7de6i9o40kx
2014-01-13 11:31:48 +01:00
Fabien Meghazi bf26965d9f [ADD] login container
bzr revid: fme@openerp.com-20140113102838-7q3tegun1p51u6s4
2014-01-13 11:28:38 +01:00
Frédéric van der Essen f72044585a [FIX] hw_escpos: removed PIL external dependency as it is already required by openerp
bzr revid: fva@openerp.com-20140113101520-meh1tswxn2eg11ge
2014-01-13 11:15:20 +01:00
Frédéric van der Essen b897920b5a [FIX] hw_escpos: added pyserial, pyqrcode & PIL as external dependencies of the module, to prevent it from being installed if they aren't available
bzr revid: fva@openerp.com-20140113100418-v08gb20ayy7eeogm
2014-01-13 11:04:18 +01:00