Xavier Morel
a67cd4c049
[FIX] t-ignore should remove injected sub-view branding below the ignore flag
...
bzr revid: xmo@openerp.com-20140225114706-j8q44cubs59tuwby
2014-02-25 12:47:06 +01:00
Frédéric van der Essen
a949f024a1
[MERGE] point_of_sale: fixing duplicated orders, fixing crash when selling goods with lot tracking, accept ean13 barcodes with a stripped leading zero
...
bzr revid: fva@openerp.com-20140225110142-oklvhmvh79u9ymuv
2014-02-25 12:01:42 +01:00
Xavier Morel
1b2be9be76
[IMP] unbrand t-raw and t-esc as keeping them branded makes very little sense
...
they can't be edited in any situation
bzr revid: xmo@openerp.com-20140225110046-90rdevm13pp4m51s
2014-02-25 12:00:46 +01:00
Frédéric van der Essen
009451f1dc
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20140225105924-1r2c9ha7703zlfxz
2014-02-25 11:59:24 +01:00
Thibault Delavallée
bb795e929d
[FIX] mail: fixed sign-in URL in notification emails, use the new web/login controller introduced in saas-3.
...
bzr revid: tde@openerp.com-20140225095054-kswinebsgsj5fex1
2014-02-25 10:50:54 +01:00
Fabien Meghazi
434f100fb8
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140225094914-419sm2gji3kiq2e2
2014-02-25 10:49:14 +01:00
Richard Mathot (OpenERP)
ee51fc0ca6
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140225093040-6k4kmj93uo2bk6t9
2014-02-25 10:30:40 +01:00
Xavier Morel
cf702eb1c6
[IMP] in view tests, replace tostring() and string comparisons by custom lxml.etree comparator
...
bzr revid: xmo@openerp.com-20140225092842-sc6whhm173azurtt
2014-02-25 10:28:42 +01:00
Gery Debongnie
893b7041f9
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140225091310-pzkj5ip17esl52kz
2014-02-25 10:13:10 +01:00
Simon Lejeune
531ab41957
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140225091121-3cuuiofh2zt923p0
2014-02-25 10:11:21 +01:00
Thibault Delavallée
700bbfcce1
[FIX] mail_thread: when reading subscription data, add a protection
...
against not planned subtype data (coming from error in subtype relationship
table, or for undisplayed subtypes, old subtypes, ...).
bzr revid: tde@openerp.com-20140225090637-mnztroc05nk7l2sl
2014-02-25 10:06:37 +01:00
Fabien Meghazi
2ab61cf001
[IMP] Rename request.httprequest.session -> request.session
...
bzr revid: fme@openerp.com-20140225090506-4rnku48yg7ruvv8p
2014-02-25 10:05:06 +01:00
Gery Debongnie
956b73998c
[FIX] fixes various problems with the search bar integration with the graph view. Now, the code correctly computes the group_bys and col_groupbys contained in the various filters in the search bar (addon web_graph)
...
bzr revid: ged@openerp.com-20140225090349-z6udsjn0cjafu0lt
2014-02-25 10:03:49 +01:00
eaa20f9586
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225060535-e6jwphbnlp4q2vc6
2014-02-25 06:05:35 +00:00
Dharmraj Jhala (OpenERP)
c6917b9c07
[MERGE] with trunk-survey2-rim addons branch
...
bzr revid: dizzy.zala@gmail.com-20140225053204-mra08nfvumkxyixa
2014-02-25 11:02:04 +05:30
Kersten Jeremy
2907c8dd66
[TYPO] PEP7 - Module calendar (no E501)
...
bzr revid: jke@openerp.com-20140224220222-dp26lvbv2bfljxvt
2014-02-24 23:02:22 +01:00
Frédéric van der Essen
4dd0d7c524
[MERGE] hw_proxy: improvements to the posbox documentation
...
bzr revid: fva@openerp.com-20140224172856-ku0tedluscdzvkjz
2014-02-24 18:28:56 +01:00
Frédéric van der Essen
0368f23b1e
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140224172822-ehn3xeb7rb1xro07
2014-02-24 18:28:22 +01:00
Frédéric van der Essen
b2c89c22bf
[IMP] hw_proxy: adding a few troubleshoot info to the manual + add the compiled pdf version to the repo
...
bzr revid: fva@openerp.com-20140224172547-diov3ubpfspmdfvy
2014-02-24 18:25:47 +01:00
Christophe Simonis
cde82643d0
[MERGE] point of sale fixes
...
bzr revid: chs@openerp.com-20140224172113-gj1t8hi7a8hr60gq
2014-02-24 18:21:13 +01:00
Simon Lejeune
1cf57507c0
[IMP] Added a button on the ir.actions.report.xml form view to allow direct access of the QWeb views associated and edit them
...
bzr revid: sle@openerp.com-20140224170839-7nqv07vp1tx5ou38
2014-02-24 18:08:39 +01:00
Xavier Morel
198640434f
[FIX] injected views need branding distribution too
...
forgot to set it up after installed injected view skipping during distribution of injectee
bzr revid: xmo@openerp.com-20140224170301-b4ta04zqsd5d2956
2014-02-24 18:03:01 +01:00
Frédéric van der Essen
5c08f38a1b
[FIXME] deactivated failed tests to make the runbot green again
...
bzr revid: fva@openerp.com-20140224164321-7631d3uqu2r2zqyw
2014-02-24 17:43:21 +01:00
Martin Trigaux
4d95d8bf03
[MERGE] [FIX] models: do not drop low level columns (aka 'magic columns') when deleting ir.model.fields
...
Without this fix, uninstalling modules using id, create_date,... in their field declaration while inheriting from existing module would drop these columns
bzr revid: mat@openerp.com-20140224162512-i5ay1jv7k8lan2rv
2014-02-24 17:25:12 +01:00
Martin Trigaux
b9f72dae74
[FIX] orm: do not drop low level columns (aka 'magic columns') when deleting ir.model.fields
...
lp bug: https://launchpad.net/bugs/1262150 fixed
bzr revid: mat@openerp.com-20140224161918-9pe1x3jeno8t82p1
2014-02-24 17:19:18 +01:00
Frédéric van der Essen
c1d5d858eb
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20140224160909-ezk3re38imtq2eo1
2014-02-24 17:09:09 +01:00
Frédéric van der Essen
3d4f063e51
[FIX] point_of_sale: accept ean13 barcodes with a stripped leading zero
...
bzr revid: fva@openerp.com-20140224160118-44bnm5kxs53n6siy
2014-02-24 17:01:18 +01:00
Simon Lejeune
d64c4a3f17
[FIX] mrp: removed empty files and barcode controller value set to path in order to be able to receive URL
...
bzr revid: sle@openerp.com-20140224151944-dqi63kjvyejp6xja
2014-02-24 16:19:44 +01:00
Frédéric van der Essen
8d5398d661
[FIX] point_of_sale: if an order fails to mark as PAID, leave it at NEW so that the pos client can process new orders. The error has to be manually corrected by the user before session closing
...
bzr revid: fva@openerp.com-20140224150830-5uddv7i1djff2aip
2014-02-24 16:08:30 +01:00
Frédéric van der Essen
95f2c5537d
[IMP] point_of_sale: make the order flush timeout dependant on the number of orders to be flushed
...
bzr revid: fva@openerp.com-20140224144143-4fhlswjk2y4skd6j
2014-02-24 15:41:43 +01:00
Christophe Matthieu
055f73322d
[FIX] website: 'window.location.origin' is not found in IE browser thats why generated manually.
...
bzr revid: chm@openerp.com-20140224143828-wq1k4931lmmm8leh
2014-02-24 15:38:28 +01:00
Christophe Matthieu
60c75d38bf
[FIX] website placeholder; website_hr_recruitment required for ie
...
bzr revid: chm@openerp.com-20140224142751-7bolxomy2nc717w0
2014-02-24 15:27:51 +01:00
Frédéric van der Essen
31cb4b8423
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20140224135038-3l6p5ebb5klmw8yr
2014-02-24 14:50:38 +01:00
Simon Lejeune
901172a194
[FIX] Workaround to get printing done with 1 worker
...
bzr revid: sle@openerp.com-20140224134732-imptqwtzyoyml2qq
2014-02-24 14:47:32 +01:00
Thibault Delavallée
bff00ec6df
[FIX] res_partner: avoid duplicating users when duplicating partners, because
...
I think your database wil hate you.
bzr revid: tde@openerp.com-20140224121004-lgy2rsszsomy7mji
2014-02-24 13:10:04 +01:00
Simon Lejeune
5557a1152c
[IMP] Report controller: little changes to get the barcode route working with reportlab 2.5
...
bzr revid: sle@openerp.com-20140224120749-nlg3n95vgghxv63y
2014-02-24 13:07:49 +01:00
Gery Debongnie
f94f50c7e8
[FIX] fixes a crash caused by incorrect use of date/datetime fields of the form 'date:interval': the list view in some case tried to format the strings as a date, and it could not parse it.
...
lp bug: https://launchpad.net/bugs/1279382 fixed
bzr revid: ged@openerp.com-20140224110554-y007810prx7qg5yi
2014-02-24 12:05:54 +01:00
Fabien Pinckaers
2d0db5a8bf
[IMP] 3 cols to respect icon and make it easier for new users to start with
...
bzr revid: fp@tinyerp.com-20140224110148-12lndtuaztxypgmw
2014-02-24 12:01:48 +01:00
Christophe Matthieu
85d3f2ebf5
[FIX][ADD] Added jquery.placeholder lib. because IE9 is not supporting the placeholders.
...
bzr revid: chm@openerp.com-20140224105958-1dji1sepr6z8dzb2
2014-02-24 11:59:58 +01:00
Kersten Jeremy
bfaa40266d
[IMP] Calendar : Check that user are not disconnected before to check next_potential_notif, that avoid to see an error in console every 5 minutes
...
bzr revid: jke@openerp.com-20140224104850-wty7kk230s72tdcy
2014-02-24 11:48:50 +01:00
Kersten Jeremy
ad86d1afdc
[FIX] Remove unused field from crm for calendar. By consequence, bug with email attendee is removed.
...
bzr revid: jke@openerp.com-20140224104745-egf6hutwzk9gcweh
2014-02-24 11:47:45 +01:00
Fabien Meghazi
d1bbeb21a1
[FIX] website's translation problems on multiple view inheritance
...
bzr revid: fme@openerp.com-20140224104301-n8dqg0lx4oijf66b
2014-02-24 11:43:01 +01:00
Simon Lejeune
7de120a2ef
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140224103630-xxn8l4i7f16dq75w
2014-02-24 11:36:30 +01:00
Simon Lejeune
62538c61e3
[IMP] Converted mrp BOM Structure to QWeb
...
bzr revid: sle@openerp.com-20140224103453-0s60blgbk7e3ho5n
2014-02-24 11:34:53 +01:00
Simon Lejeune
09d34a8e96
[IMP] Report controller: put the css/js as relative links in the minimal html page (they were copied inline)
...
bzr revid: sle@openerp.com-20140224103329-pmmmcl56mzmynmx5
2014-02-24 11:33:29 +01:00
Fabien Meghazi
6df317c546
[FIX] website's translation problems on multiple inheritance
...
bzr revid: fme@openerp.com-20140224103235-2s9de5k71xfa2qko
2014-02-24 11:32:35 +01:00
Fabien Pinckaers
3e31d2cb03
[IMP] Allow to press select where you want the new line
...
bzr revid: fp@tinyerp.com-20140224095553-qc4lhnpetczl1t7v
2014-02-24 10:55:53 +01:00
Xavier Morel
1bc89c9738
[FIX] unbreak website_blog.css
...
bzr revid: xmo@openerp.com-20140224094829-99ayhh5shzwu6n44
2014-02-24 10:48:29 +01:00
b0d401d6e5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063809-721gx6izacr4uc07
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073238-b28iwuxw1cp32fas
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074450-qijz5rsfsjahcgq0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060308-psqz6bx89jpqt428
2014-02-24 06:03:08 +00:00
5580324bbf
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222063856-jg0p4f82hy0yw5f0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222063912-upicgao9ly9iu2wf
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223070706-qx82kgcpxvuqfmod
2014-02-23 07:07:06 +00:00
Xavier Morel