pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,218 Commits 1 Branch 0 Tags
77be55fcc7de35c9a9de6451fe056e94de7fe2d6
Commit Graph
103218 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Simonis db6fb31870 [MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73 
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
 2014-04-03 17:59:04 +02:00
Josse Colpaert d45fd02abd [IMP] Push rules should try to find routes on warehouse first before searching anything 
bzr revid: jco@openerp.com-20140403155735-y357mj3gtp7j3x7i
 2014-04-03 17:57:35 +02:00
Simon Lejeune 126d61796a [FIX] abstract_report: correctly pass the active ids in wrapped_report.set_context, fix analytic journal from ir.ui.menu by setting a consistent context 
bzr revid: sle@openerp.com-20140403154856-s3i220d6w1yw4e5s
 2014-04-03 17:48:56 +02:00
Quentin (OpenERP) fc3624f54a [FIX] stock: forgot one procurement_id field in previous commit 
bzr revid: qdp-launchpad@openerp.com-20140403153923-lvu6n9bhlluesx3p
 2014-04-03 17:39:23 +02:00
Christophe Simonis c6b281c3f0 [FIX] share: move inheritance from res.user before the one from res.groups because res.groups need the change on res.users in its init() function. 
[FIX] share: call parent init() if present in res.groups

bzr revid: chs@openerp.com-20140403153129-jq9zc7ityoy25c73
 2014-04-03 17:31:29 +02:00
Thibault Delavallée 08044cd2a2 [FIX] mass_mailing: stat button should redirect to the report view, not to a create menu wizard 
bzr revid: tde@openerp.com-20140403153014-v0w4z280e2gxrh7u
 2014-04-03 17:30:14 +02:00
Thibault Delavallée 28fe375aac [ADD] mass_mailing: new wizard to better handle list creatoin 
and better managemetn from the mass mailing form view (still WIP).

Also integrated basic statbutton, but they have to be improved.

bzr revid: tde@openerp.com-20140403152329-u81p60c7f8rgypaz
 2014-04-03 17:23:29 +02:00
Quentin (OpenERP) 9c1debf7d9 [FIX] base_gengo: don't wait another cron job execution to ask translation for the next n words 
bzr revid: qdp-launchpad@openerp.com-20140403151746-znoheqb8scjmudct
 2014-04-03 17:17:46 +02:00
Christophe Simonis a59b438ceb [FIX] share: at module init force re-generation of the user groups view without the shared groups 
bzr revid: chs@openerp.com-20140403145815-i3q3cprl2rvdfunf
 2014-04-03 16:58:15 +02:00
Quentin (OpenERP) b4dc004c01 [FIX] stock: procurement orderpoint fixed and a bit refactored 
bzr revid: qdp-launchpad@openerp.com-20140403145216-pfs8b73a302e7gjy
 2014-04-03 16:52:16 +02:00
Denis Ledoux 73b3c851da [FIX] website*: remove unusable demo links from manifests 
bzr revid: dle@openerp.com-20140403145128-9w92v4mmasz66mqj
 2014-04-03 16:51:28 +02:00
Gery Debongnie 64fecc86b7 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140403144651-9c2a4wi5klvtnw75
 2014-04-03 16:46:51 +02:00
Gery Debongnie a108599e28 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140403143727-uvjz6by9xw5g3lf6
 2014-04-03 16:37:27 +02:00
Olivier Dony 27be515eab [FIX] res.partner: missing index on parent_id column 
bzr revid: odo@openerp.com-20140403143717-dy2bszaevsyivryo
 2014-04-03 16:37:17 +02:00
Gery Debongnie 9d915db214 [FIX] read_group has been changed to return the results with field:interval as key (for example, date_deadline:week), to avoid name collisions. This commit changes the web client to make sure it properly processes the new result format. No change at all for queries that do not use the field:interval format (addon web) 
bzr revid: ged@openerp.com-20140403143534-3jpugw9g8n966n9t
 2014-04-03 16:35:34 +02:00
Olivier Dony fba0d3da9a [REM] google_drive: remove unused (but sourced) Goggle API JS lib 
Should have been removed when Google Drive API was switched to
server-side Python at revid:pga@tinyerp.com-20130523104155-83gmp2gucvackppv

bzr revid: odo@openerp.com-20140403143448-vds7crizqed0l80a
 2014-04-03 16:34:48 +02:00
Simon Lejeune 4975d2b9dc [FIX] fixed report translation and translate overdue report into partner's lang 
bzr revid: sle@openerp.com-20140403143235-mpw30fq4j2nyov6x
 2014-04-03 16:32:35 +02:00
Gery Debongnie 7dd2e6789d [FIX] when using readgroup in eager mode, there is a possible name collision when grouping on several fields with different intervals, for ex, date_deadline:month, date_deadline:week. This commit resolves the issue by changing the keys 'field' into 'field:interval' (for ex, date_deadline:month) in the results (orm.py) 
bzr revid: ged@openerp.com-20140403142923-puiruf29tbi1pjj9
 2014-04-03 16:29:23 +02:00
Olivier Dony b89d6d99c8 [FIX] product_email_template: typos 
bzr revid: odo@openerp.com-20140403142836-9na8qo7y7gqr0nmi
 2014-04-03 16:28:36 +02:00
Antony Lesuisse 7c29e3847c [FIX] increase js test timeout to 60 
when runbot is overloaded, test speed can be slow, 2s per HTTP request

bzr revid: al@openerp.com-20140403134109-nzg71xmybw1p5bsi
 2014-04-03 15:41:09 +02:00
Barad Mahendra 002f33961e [IMP]fix typo 
bzr revid: mba@tinyerp.com-20140403132033-4b5yj6uy0mfokao5
 2014-04-03 18:50:33 +05:30
Vidhin Mehta (OpenERP) 77390a8b76 [MERGE]Trunk. 
bzr revid: vme@tinyerp.com-20140403131938-75bwnfhg6frydlnb
 2014-04-03 18:49:38 +05:30
Thibault Delavallée 03071cacf0 [ADD] mass_mailing: added files cited in the previous commit ^^ 
bzr revid: tde@openerp.com-20140403131644-2gdpg52gkxm9tf54
 2014-04-03 15:16:44 +02:00
Josse Colpaert 1ff8b73671 [MERGE] Merge from trunk-wms 
bzr revid: jco@openerp.com-20140403130335-9grgeg4e0r0yqsbi
 2014-04-03 15:03:35 +02:00
Thibault Delavallée b6eeedea7d [IMP] mass_mailing: testing the mailing is now done using a wizard, to avoid 
bloating the mailing ofrm view

bzr revid: tde@openerp.com-20140403125905-sq6ksthkahna29ud
 2014-04-03 14:59:05 +02:00
Vidhin Mehta (OpenERP) ec02c17ded [IMP]Add test cases. 
bzr revid: vme@tinyerp.com-20140403125219-i34g7kxpcsbo1pcq
 2014-04-03 18:22:19 +05:30
Josse Colpaert dc2c8551c6 [IMP] Default supply warehouse should be on the warehouse and not on products and the rest should only be created 
bzr revid: jco@openerp.com-20140403124714-z8dv0g9pjx8n63mn
 2014-04-03 14:47:14 +02:00
Josse Colpaert 97b2c5876e [MERGE] Merge from trunk-wms-docs-jco 
bzr revid: jco@openerp.com-20140404144134-bajb67hcw2a2yu5o
 2014-04-04 16:41:34 +02:00
Josse Colpaert 7fd703f58d [MERGE] Merge from trunk-wms 
bzr revid: jco@openerp.com-20140404143809-0qi14pmi5762iycp
 2014-04-04 16:38:09 +02:00
Josse Colpaert 1f03b8a901 [IMP] Add use case + review gde + mrp 
bzr revid: jco@openerp.com-20140404143655-b55777mcowm6vlwi
 2014-04-04 16:36:55 +02:00
Quentin (OpenERP) 4254056188 [MERGE] merged jco's feature branch clearing the packages and logistic units concepts 
bzr revid: qdp-launchpad@openerp.com-20140404131637-a23gqw42132q6ig5
 2014-04-04 15:16:37 +02:00
Barad Mahendra debd43e78c [Merge]with trunk 
bzr revid: mba@tinyerp.com-20140331091837-ysy7r74256f83kqv
bzr revid: mba@tinyerp.com-20140403123846-rfcktmyc3drda5y5
 2014-04-03 18:08:46 +05:30
Barad Mahendra c395f97d13 [Merge]with trunk 
bzr revid: mba@tinyerp.com-20140403123831-nb68n6863f9cnfc1
 2014-04-03 18:08:31 +05:30
Christophe Simonis 438025dac8 [FIX] setup.py: correct included packages in py2exe options 
bzr revid: nightly_server-20140403123144-pm4dqs04dbfmv1p8
 2014-04-03 14:31:44 +02:00
Thibault Delavallée 1380f597a2 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140403122027-3w055e5olf23dzw9
 2014-04-03 14:20:27 +02:00
Gery Debongnie 1aba5f08cf [FIX] fixes read_group so that it uses the correct _count attribute in the result dictionary (orm.py) 
bzr revid: ged@openerp.com-20140403115605-tuboy66r9ews2u0e
 2014-04-03 13:56:05 +02:00
Dharmraj Jhala (OpenERP) 37c390beb6 [IMP] merged methods get_finished_survey_input ids with filter_input_ids in survey.py and to retain correct filters improved exception handling in controller 
bzr revid: dizzy.zala@gmail.com-20140403115423-171x3cbxie82qv8w
 2014-04-03 17:24:23 +05:30
Thibault Delavallée 271e43c3ed [FIX] website_blog: content post process: forgotten the unicity of paragraph tagging 
bzr revid: tde@openerp.com-20140403115122-wuk65a5ua7ewqzz7
 2014-04-03 13:51:22 +02:00
Thibault Delavallée 8f105b6624 [IMP] website_blog: path computation (unique key) for paragraphs in medium-like blogs 
is now done server-side and stored directly in the html content, as post processing.
The front-end attaches messages based on the attribute data-chatter-id, but do not
compute the attribute itself anymore.
Misc cleaning of code.

bzr revid: tde@openerp.com-20140403112656-ane3ovhh70qdc8b4
 2014-04-03 13:26:56 +02:00
Jitendra Prajapati (OpenERP) 911552c2e7 [IMP]optimized code for name_get method 
bzr revid: jpr@tinyerp.com-20140403111445-lej57pocr2d0qokm
 2014-04-03 16:44:45 +05:30
Dharmraj Jhala (OpenERP) 4e2942d418 [IMP] moved prepare_result and get_input_summary to the model from controller and some other improvements 
bzr revid: dizzy.zala@gmail.com-20140403104637-dpqi4euo5czy3rsk
 2014-04-03 16:16:37 +05:30
Jitendra Prajapati (OpenERP) 8337d2be8c [IMP]improve code 
bzr revid: jpr@tinyerp.com-20140403102411-25s6x5zxjlhi1jw0
 2014-04-03 15:54:11 +05:30
Vidhin Mehta (OpenERP) a2bb4bb603 [ADD]Add many usefull comments. 
bzr revid: vme@tinyerp.com-20140403101936-7qvi6wqvfpxpcpg9
 2014-04-03 15:49:36 +05:30
Simon Lejeune 55090e56db [FIX] payment order: do not use qweb contact widget on res.bank as it is made for res.partner and res.bank has not all the res.partner fields 
bzr revid: sle@openerp.com-20140403100543-t0m45q1wkgbkli7i
 2014-04-03 12:05:43 +02:00
Quentin (OpenERP) 944e39d0b5 [MERGE] procurement: performance issue. Courtesy of Holger Brunn (Therp) 
lp bug: https://launchpad.net/bugs/1297887 fixed

bzr revid: qdp-launchpad@openerp.com-20140403095358-2jqitwe6se5p4mn5
 2014-04-03 11:53:58 +02:00
Gery Debongnie 75b66ed77c [FIX] work around a read bug: false data are fetched when the same field is present multiple times as a field parameter. The solution is to make sure the list many2onefields does not contain duplicate fields (orm.py) 
bzr revid: ged@openerp.com-20140403094316-kmlliqbwd14ey68p
 2014-04-03 11:43:16 +02:00
Gery Debongnie 0d4732b5c4 [FIX] makes sure the internal data structure of pivot table is correct after update_data (the children were not correct when the tree of headers was not full, after an expand for example (addon web_graph) 
bzr revid: ged@openerp.com-20140403094050-vjeq4dks86mejuub
 2014-04-03 11:40:50 +02:00
Quentin (OpenERP) 2006e8d6be [MERGE] _compute_planned_workcenter passes wrong magic value for absent calendar_id. Courtesy of Holger Brunn (Therp) 
lp bug: https://launchpad.net/bugs/1297352 fixed

bzr revid: qdp-launchpad@openerp.com-20140403093833-923ly0uz860gd3i2
 2014-04-03 11:38:33 +02:00
Jitendra Prajapati (OpenERP) 7d06600a77 [MERGE]with main branch 
bzr revid: jpr@tinyerp.com-20140403093632-rdnixbj5vulsoppy
 2014-04-03 15:06:32 +05:30
Jitendra Prajapati (OpenERP) 0809e29d68 [MERGE]with main branch 
bzr revid: jpr@tinyerp.com-20140403093140-em398ce2axns6a81
 2014-04-03 15:01:40 +05:30