pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,003 Commits 1 Branch 0 Tags
affeeeda2e445b5bddfa0818dc15485e4c19dc5d
Commit Graph
85003 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Turkesh Patel (Open ERP) b5abfdcc71 [ADD] add template to post answer and improved demo data of answers. 
bzr revid: tpa@tinyerp.com-20140225095845-swmojhdo31t871pp
 2014-02-25 15:28:45 +05:30
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
Turkesh Patel (Open ERP) 837a43926e [ADD] add template to ask qestion and relatedd code. 
bzr revid: tpa@tinyerp.com-20140225093418-xab0yv4tqz4yx0u2
 2014-02-25 15:04:18 +05:30
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
Parth Gajjar (Open ERP) 7c686feaee [ADD] added country flags in res.country 
bzr revid: pga@tinyerp.com-20140225091358-475bxx2z9ipahjw1
 2014-02-25 14:43:58 +05:30
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
Chirag Dodiya (OpenERP) dbc6a8368d [MRG]Merge with trunk 
bzr revid: cod@tinyerp.com-20140225083944-abbn3m7e5c26crk1
 2014-02-25 14:09:44 +05:30
Turkesh Patel (Open ERP) 615d5c4ab8 [IMP] improved code to add search functionality 
bzr revid: tpa@tinyerp.com-20140225072356-v4sizgc1yn3mv3pl
 2014-02-25 12:53:56 +05:30
Chirag Dodiya (OpenERP) 47fa47e23b [MRG]Merge with trunk 
bzr revid: cod@tinyerp.com-20140225072331-xzbo2aedsk2te98n
 2014-02-25 12:53:31 +05:30
Launchpad Translations on behalf of openerp eaa20f9586 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225060535-e6jwphbnlp4q2vc6
 2014-02-25 06:05:35 +00:00
Mahendra Barad (OpenERP) 21c93eddf4 [IMP]arrow scroll on cover 
bzr revid: mba@tinyerp.com-20140225053329-fbmtjvgjwghj978n
 2014-02-25 11:03:29 +05:30
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
Darshan Kalola (OpenERP) ba7b273b18 [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140225045320-e2ukd1snv3yfls0r
 2014-02-25 10:23:20 +05:30
Darshan Kalola (OpenERP) 7dc413070c [IMP]mail_follower:closed dropdown when there is no child element in ul. 
bzr revid: dka@tinyerp.com-20140225045142-fg6qbnlvl4ylys0k
 2014-02-25 10:21:42 +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
Thibault Delavallée dd99c96ca2 [CLEAN] mail: some code cleaning in the modifications 
bzr revid: tde@openerp.com-20140224142236-l61eqddc4vq9y861
 2014-02-24 15:22:36 +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
Thibault Delavallée 47b1500c4b [CLEAN] email_template: cleaned modified code to lessen the diff 
bzr revid: tde@openerp.com-20140224135008-b43mf3fqw0ib13r6
 2014-02-24 14:50:08 +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
Mahendra Barad (OpenERP) eb30747335 [IMP]improved animation for drodown 
bzr revid: mba@tinyerp.com-20140224133959-idr1pqp5imhudldv
 2014-02-24 19:09:59 +05:30
Thibault Delavallée 2641d09c79 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140224132100-w9pw5z32hz41mqcw
 2014-02-24 14:21:00 +01:00
Thibault Delavallée 4739eb138b [IMP] mail, email_template: still continuing work to improve performances of mass mailing. 
main differences :
- record_name is not a function field anymore, but a char field + a method in create
if not given (default-like, but dependent of other values). This allows the composer
to give a value for record_name (False for email mass mailing) to avoid browsing
records and having their access rights issues in the way
- author_id, email_from coming from composer instead of called in every mail.message
creation
- moved code dealing with attachments from send_mail to get_mail-values, to that at
the end of this method we know all values of the email

Some tests have been updated / temporarily disabled.

bzr revid: tde@openerp.com-20140224132038-txdi0g30a7fzbnxp
 2014-02-24 14:20:38 +01:00
Turkesh Patel (Open ERP) d183eae422 [IMP] improved code to show total questions and improved domain show perfect values in pager 
bzr revid: tpa@tinyerp.com-20140224123644-2b9rm5zl14u0vkii
 2014-02-24 18:06:44 +05:30
Turkesh Patel (Open ERP) d2c447c80f [ADD] added pager in bottom of list 
bzr revid: tpa@tinyerp.com-20140224122726-g87zfwm5jlq5k2dc
 2014-02-24 17:57:26 +05:30