pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
81391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chirag Dodiya (OpenERP Trainee) abb3122c2a [MERGE] merge with bzr merge lp:openobject-server 
bzr revid: chiragdd7@gmail.com-20130813050340-9q3b6fse8sghtc2d
 2013-08-13 10:33:40 +05:30
Christophe Matthieu 59ba4e7561 [WIP] website_sale: refactoring and use inherit_option_id 
bzr revid: chm@openerp.com-20130812163123-3ako1rggjnszzi2h
 2013-08-12 18:31:23 +02:00
niv-openerp 7795418aab Re-packaged achtung 
bzr revid: nicolas.vanhoren@openerp.com-20130812152102-p9v8cpck3uezb45q
 2013-08-12 17:21:02 +02:00
niv-openerp 3fa7930823 Re-created a requirejs config that works 
bzr revid: nicolas.vanhoren@openerp.com-20130812151036-jr2288c99zb1s8sm
 2013-08-12 17:10:36 +02:00
Christophe Matthieu ed5ad1c91d [IMP] website_event: category and location in the left menu are optional 
bzr revid: chm@openerp.com-20130812140243-ds50tzo36lqvdxyr
 2013-08-12 16:02:43 +02:00
Christophe Matthieu f6c27fda01 [IMP] website: refactoring + create method pager and template pager. Used by website_sale and website_event 
bzr revid: chm@openerp.com-20130812134826-tij95o38mf3r7tts
 2013-08-12 15:48:26 +02:00
Christophe Matthieu 8523e66bc4 [IMP] website: create method pager and template pager. Used by website_sale and website_event 
bzr revid: chm@openerp.com-20130812134312-jmy2je288b4ofazy
 2013-08-12 15:43:12 +02:00
Paramjit Singh Sahota d55226555b [IMP] On the job position page, add a right column with information like 
the location, contact data.

bzr revid: psa@tinyerp.com-20130812132745-dahx6q4k10cd1v84
 2013-08-12 18:57:45 +05:30
Thibault Delavallée 6f300c0875 [MERGE] [IMP] hr_holidays: days computation and workflow update 
Remaining days calculation:
- get_days now also calculate virtual remaining days that take into account the confirmed leave requests.
- virtual remaining days are taken into account when confirming / validating a leave request. This allows to avoid having several pending leave requests that cannot be validated because of a lack of remaining days once all requests are validated.

Workflow update:
- begins in confirm state
- added transition confirm->draft; transition draft->confirm is not automatic anymore (Confirm button)
- added transition refuse->draft, to reset the leave request and allow edition

Misc
- leave summary does not show refused leave requests anymore
- added tests + some fixes for bugs trigerred by the tests (mainly access rights issues)
- added changelog

bzr revid: tde@openerp.com-20130812131723-ioe7sfgvl20z0npc
 2013-08-12 15:17:23 +02:00
Xavier Morel 8f73da7290 [FIX] extraction & saving of view sections 
editor.getData() only gets the (cleaned-up) innerHTML of the editor,
whereas the server expects all of the editor (root element included).

* #destroy() so ckeditor removes its stuff
* cleanup attributes/classes added internally
* send/save outerHTML data

bzr revid: xmo@openerp.com-20130812123612-gxen3ifd2pbbdg78
 2013-08-12 14:36:12 +02:00
Thibault Delavallée 56360dd74d [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130812122719-58yirruv0g3e7o02
 2013-08-12 14:27:19 +02:00
Thibault Delavallée e54dde9559 [IMP] hr_holidays: leave summary: removed default filter default_validated, but added a domain to exclude refused requests from the summary. This was creating wrong numbers that do not make any sense. 
bzr revid: tde@openerp.com-20130812122657-g09wsfepdb2dh2dy
 2013-08-12 14:26:57 +02:00
Renato Lima 5bd126a761 Added brazilian taxes template in l10n_br module. 
bzr revid: renatonlima@gmail.com-20130812122143-jn08f7e18fie3sxe
 2013-08-12 09:21:43 -03:00
Amit Bhavsar (Open ERP) 028d62c391 [MERGE] merge with latest trunk 
bzr revid: amb@tinyerp.com-20130812121219-4opfk262kgmakvsb
 2013-08-12 17:42:19 +05:30
Xavier Morel 8a697a8b84 [FIX] missing element reference used in error handler 
bzr revid: xmo@openerp.com-20130812121148-wuyxjn6ubyc4tthp
 2013-08-12 14:11:48 +02:00
Xavier Morel de952ae352 [FIX] don't extract the root ir.ui.view as an embedded field 
bzr revid: xmo@openerp.com-20130812121121-e3ch0b2u5j1u3ytp
 2013-08-12 14:11:21 +02:00
Thibault Delavallée 69e80d989c [MERGE] [REF] crm stage management cleaning 
[REM] base_stage removal

Using stages and states is not easy to manage. Indeed those two fields mess with the same basic concept. This task remove the state on crm.lead and crm.claim models, leaving only stages.

Main features:
- removed base_stage inheritance on crm.lead and crm.claim models
- removed state field on crm.lead and crm.claim models
- removed state field on crm.case.stage model
- added date_last_stage_update on crm.lead and crm.claim models, holding the date of the last stage change, allowing reporting and analysis on time spend in stages
- date_open is set when assigning an user to the lead / claim; date_open now means assignation date

This allows nearly to remove all buttons on the form view, leaving only a dynamic stage management using the statusbar. On opportunities, Mark Won / Lost are kept.

Subtypes have been updated :
- new: stage_id.sequence=1
- stage changed: stage_id changed, not new
- user assigned: when user_id is set

This branch is the last one removing state where stage already exits. There is no need anymore of base_stage that is removed.

Misc:
- [IMP] views accordingly;
- [IMP] reports accordingly, added date_last_stage_update in reports;
- [IMP] subtypes;
- [DOC] doc directory + changelog + stage explanation in crm_lead

bzr revid: tde@openerp.com-20130812120725-u10zptg2m4z8ah4k
 2013-08-12 14:07:25 +02:00
ajay javiya (OpenERP) 38e214e081 [IMP]: show responsible field to every user 
bzr revid: aja@tinyerp.com-20130812120429-0s3ushkgxyak57ur
 2013-08-12 17:34:29 +05:30
Fabien Pinckaers 4e6fcf9fbd [FIX] footer 
bzr revid: fp@tinyerp.com-20130812115446-i467b25m22mstka5
 2013-08-12 13:54:46 +02:00
Fabien Pinckaers 6989e90f0a [IMP] Modules names 
bzr revid: fp@tinyerp.com-20130812114917-d98hdknrr55ayq8g
 2013-08-12 13:49:17 +02:00
Thibault Delavallée c3b9d6c52c [CLEAN] crm: some cleaning in demo data 
bzr revid: tde@openerp.com-20130812114748-sngknmr1pjaq13ag
 2013-08-12 13:47:48 +02:00
Fabien Pinckaers d81b6b4fc8 [IMP] removed auto_install --> Apps menu makes it unuseful 
bzr revid: fp@tinyerp.com-20130812114346-0t9v2eiwbimsrfp5
 2013-08-12 13:43:46 +02:00
Paramjit Singh Sahota 4e989de98d Back => All Jobs. 
bzr revid: psa@tinyerp.com-20130812110837-tvfg1lq0yly187ni
 2013-08-12 16:38:37 +05:30
Paramjit Singh Sahota 739b07ec97 [IMP]Placed JOBS menu in the footer. 
bzr revid: psa@tinyerp.com-20130812110701-fxndcghf2onoevai
 2013-08-12 16:37:01 +05:30
Fabien Meghazi f9463c0490 [FIX] Customize menu. Added data-view-xmlid in html's rendered dom 
bzr revid: fme@openerp.com-20130812105521-esswt5zckea0lzuc
 2013-08-12 12:55:21 +02:00
Fabien Meghazi 19ee2aa6ed [ADD} simplejson in website rendering context 
bzr revid: fme@openerp.com-20130812105332-p2vwqo2ozdjm2zvq
 2013-08-12 12:53:32 +02:00
Fabien Meghazi e18fc2b40a [FIX] page controller optional args 
bzr revid: fme@openerp.com-20130812104825-9i4lg1nywepxf9an
 2013-08-12 12:48:25 +02:00
Paramjit Singh Sahota 7bbf7e5bd6 [IMP] Used write_date instead of post_date 
And make the description h3 visible when the description of the job exists.

bzr revid: psa@tinyerp.com-20130812104232-0n9a2b4owclecsvy
 2013-08-12 16:12:32 +05:30
Paramjit Singh Sahota 9b3560e589 [IMP] Removed 'section' and improved code. 
bzr revid: psa@tinyerp.com-20130812103254-uziu09v5thp0lahu
 2013-08-12 16:02:54 +05:30
Christophe Matthieu a82f0fa1df [WIP] website: refactoring 
bzr revid: chm@openerp.com-20130812102416-7sxiw4owqatxzkqh
 2013-08-12 12:24:16 +02:00
Paramjit Singh Sahota 6d4c50e3e7 Improved code used t-field instead of t-esc where needed. 
bzr revid: psa@tinyerp.com-20130812102015-apdx33yr4n17x3hz
 2013-08-12 15:50:15 +05:30
Paramjit Singh Sahota 8f0071e3c8 [IMP] Removed ' table-bordered table-striped table-hover' css from the table. 
Removed the APPLY button.

bzr revid: psa@tinyerp.com-20130812100527-ze18h3k9xs6sgrk2
 2013-08-12 15:35:27 +05:30
Paramjit Singh Sahota 4f3bfd4c4d [IMP] career -> jobs and removed the requirements field from view. 
bzr revid: psa@tinyerp.com-20130812100113-7o6t3sjgb8h79zdp
 2013-08-12 15:31:13 +05:30
Martin Trigaux 1bdd49c23a [FIX] account: pass context to move line reconciliation creation (opw #594546) 
bzr revid: mat@openerp.com-20130812094859-gyg5d1jz69zikt7s
 2013-08-12 11:48:59 +02:00
Paramjit Singh Sahota 9ad4edf35c [REM] Removed the captcha plugin. 
bzr revid: psa@tinyerp.com-20130812093847-xp734gjsu21moiov
 2013-08-12 15:08:47 +05:30
Fabien Meghazi a8e3f7d356 [FIX] Apps dropdown 
bzr revid: fme@openerp.com-20130812093745-1c8iqwbeg38fp62p
 2013-08-12 11:37:45 +02:00
Xavier Morel fc8321f103 [ADD] inline edition plugin 
* No feature on plugin itself save marking field zones
  - TODO: handling of specific field types
* ckeditor 4.3 (?) broke sharedspace plugin
* symlinked ckeditor, to fix
* new save API (by view section)

bzr revid: xmo@openerp.com-20130812093314-ur8l7jjzf40fwlxy
 2013-08-12 11:33:14 +02:00
Christophe Matthieu 3f86396b4e [IMP] website: move hearder and footer in layout 
bzr revid: chm@openerp.com-20130812093255-3cbehw7nx0h57qca
 2013-08-12 11:32:55 +02:00
niv-openerp ea13adf323 Used bower for dependencies 
bzr revid: nicolas.vanhoren@openerp.com-20130812092501-c4auij2gb90drid1
 2013-08-12 11:25:01 +02:00
Mansi Kariya (OpenERP Trainee) f8e800cc0e [Merge] Merged with main addons 
bzr revid: mansi.mk.179@gmail.com-20130812091443-xn1p6tvotr435163
 2013-08-12 14:44:43 +05:30
Mansi Kariya (OpenERP Trainee) 70d2a38592 [IMP] Optimized code 
bzr revid: mansi.mk.179@gmail.com-20130812091321-o6ql1csd9sq78vs7
 2013-08-12 14:43:21 +05:30
Christophe Matthieu 2abdcf99bc [FIX] website_sale: renames files 
bzr revid: chm@openerp.com-20130812091249-oz2ji7m8remif0xo
 2013-08-12 11:12:49 +02:00
niv-openerp 47ed4255c1 merge trunk 
bzr revid: nicolas.vanhoren@openerp.com-20130812085308-grncspjucklvd5hh
 2013-08-12 10:53:08 +02:00
Fabien Pinckaers 1c83621691 [FIX] bug in prev/next ecommerce 
bzr revid: fp@tinyerp.com-20130812084149-a37cr8tzfolk395h
 2013-08-12 10:41:49 +02:00
Fabien Pinckaers 2d8821b28b [IMP] View defined 2 times 
bzr revid: fp@tinyerp.com-20130812083818-zt6alsh8l6ruaxmx
 2013-08-12 10:38:18 +02:00
Fabien Pinckaers 08f21c07c8 [IMP] Only Apps menu 
bzr revid: fp@tinyerp.com-20130812083520-rjplfn8578uxo06h
 2013-08-12 10:35:20 +02:00
Thibault Delavallée bf09b267a0 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130812075853-d12p01w8a5h0ez6w
 2013-08-12 09:58:53 +02:00
Xavier Morel 212f088aea [MERGE] from trunk-website-al 
bzr revid: xmo@openerp.com-20130812075650-sv5v98kuuifaog2z
 2013-08-12 09:56:50 +02:00
Xavier Morel fc2d751eb3 [IMP] dict.get's default is None, remove pointless explicit defaults 
bzr revid: xmo@openerp.com-20130812075044-8d4nc5dscarbu1vj
 2013-08-12 09:50:44 +02:00
Fabien Meghazi bf9bb35039 [ADD] Qweb __stack__ and __caller__ in QWeb rendering context 
bzr revid: fme@openerp.com-20130812105211-r2ct4wjf2hj8gbeu
 2013-08-12 12:52:11 +02:00