Commit Graph
75533 Commits
Author SHA1 Message Date
Nimesh Contractor (OpenERP) 301919d9a0 [MERGE] with trunk.
bzr revid: nco@tinyerp.com-20130722054812-wimj8aj06y0zlexy
2013-07-22 11:18:12 +05:30
Quentin (OpenERP) 43d5f2a2db [WIP] commit before the weekend, not sure everything is working as expected
bzr revid: qdp-launchpad@openerp.com-20130719171514-1f9whgnp1b2s64nk
2013-07-19 19:15:14 +02:00
Josse Colpaert 2734ef3769 [WIP] change putaway removal of location in stock_location_view
bzr revid: jco@openerp.com-20130719164755-7qwh0er9em47o8f8
2013-07-19 18:47:55 +02:00
niv-openerp 6021f031e5 [IMP] Added possibility to customize the tipsy of kanban groups in kanban views
bzr revid: nicolas.vanhoren@openerp.com-20130719154604-vgr3wtn6xm1ezywg
2013-07-19 17:46:04 +02:00
Josse Colpaert 7a47bc28c6 [WIP] Add routes on stock.move, add related sequence on procurement rule for search of rule by sequence
bzr revid: jco@openerp.com-20130719150900-2icla8flwxvbnr9e
2013-07-19 17:09:00 +02:00
Josse Colpaert 7ee4eb2656 [WIP] Add removal and putaways in views
bzr revid: jco@openerp.com-20130719115533-754m6591p3ykutea
2013-07-19 13:55:33 +02:00
Denis Ledoux c8404ec934 [MERGE]upstream
bzr revid: dle@openerp.com-20130719100642-34eq4o6n3hreg96b
2013-07-19 12:06:42 +02:00
Thibault Delavallée c63c20e066 [REM] Removed base_stage. One last part of 'generic case management' goes away from OpenERP.
bzr revid: tde@openerp.com-20130719100411-59dx6c7wi6n3gf00
2013-07-19 12:04:11 +02:00
Thibault Delavallée 163d88ea32 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130719100119-ohpzxw4r1fxta93k
2013-07-19 12:01:19 +02:00
Quentin (OpenERP) 1b8a999bef [MERGE] wmsimplement-seduce
bzr revid: qdp-launchpad@openerp.com-20130719094838-bkwint5sofnmytw1
2013-07-19 11:48:38 +02:00
Thibault Delavallée f37497aaa8 [MERGE] [REF] project task/issue stage management cleaning
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 project.task and project.issue models, leaving only stages.

Main features:
- removed base_stage inheritance on project.task and project.issue models
- removed state field on project.task and project.issue models
- removed state field on project.task.type model
- added date_last_stage_update on project.task and project.issue 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 task / isuse; date_open now means assignation date

This allows to remove all buttons on the form view, leaving only a dynamic stage management using the statusbar.

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

Misc:
- [IMP] views accordingly;
- [IMP] reports accordingly, added date_last_stage_update in reports;
- [IMP] subtypes
- [REM] [REF] [TESTS] removed some tests because they are not applicable anymore; rewrite some tests and moved some of them into unittests
- [DOC] doc directory + changelog + stage explanation in project and project_issue;
- [REM] removed project.task.reevaluate wizard

bzr revid: tde@openerp.com-20130719094706-ea0hbwjj99pochzo
2013-07-19 11:47:06 +02:00
Paramjit Singh Sahota 73fecedc4b [FIX] web_calendar: do not generate invalid domain if views does not specify a "date_stop" field
lp bug: https://launchpad.net/bugs/1197323 fixed

bzr revid: chs@openerp.com-20130719092515-7yrvp0ifooa6rxae
2013-07-19 11:25:15 +02:00
Christophe Simonis 03381c761d [FIX] expression: a valid leaf must have a non empty string as first element or be the magic TRUE_LEAF/FALSE_LEAF
lp bug: https://launchpad.net/bugs/1197323 fixed

bzr revid: chs@openerp.com-20130719091903-28ez0txxyjh6qiii
2013-07-19 11:19:03 +02:00
Thibault Delavallée 573220c286 [FIX] project: fixed last commit
bzr revid: tde@openerp.com-20130719091733-awl83dlr56fih8wh
2013-07-19 11:17:33 +02:00
Vidhin Mehta 21cc22b9e9 [IMP]check parent is exist or not.
lp bug: https://launchpad.net/bugs/1202120 fixed

bzr revid: vme@tinyerp.com-20130719090753-t1o4l3pyxd2t5kv9
2013-07-19 14:37:53 +05:30
Thibault Delavallée 85b1d336e3 [CLEAN] project: misc cleaning before merging
bzr revid: tde@openerp.com-20130719090058-wngpyzf7oz3rnftp
2013-07-19 11:00:58 +02:00
Thibault Delavallée 67ac805e51 [MERGE] [IMP] fields: date, datetime: added MONTHS variable holding list of (month_number, month_name) + [DOC] updated changelog
This allows to remove the definition of MONTHS that appear in several addons, notably in reporting. Addons branches will come that use this new attribute

bzr revid: tde@openerp.com-20130719081834-dhiwl13vxd5fmbrr
2013-07-19 10:18:34 +02:00
Josse Colpaert 2b3fb50997 [WIP] Add YML files and check stock/shipment.yml, make sure stock_account takes all the files(__openerp__.py) and that way start handling problems purchase fifo lifo tests
bzr revid: jco@openerp.com-20130718164715-m2c7mbkb5ph9a82g
2013-07-18 18:47:15 +02:00
Denis Ledoux c89bd96143 [ADD]crm_partner_assign: lead demo data, with portal user assigned
bzr revid: dle@openerp.com-20130718144344-zwy1eg9zxvjjeu0g
2013-07-18 16:43:44 +02:00
Josse Colpaert e0f8a9d5a7 [WIP] Use of trg_model for purchase workflow, but have to see why it does not work
bzr revid: jco@openerp.com-20130718131816-i2b2ga6updkmjmq0
2013-07-18 15:18:16 +02:00
Josse Colpaert 9c2536bc8a [WIP] Add domain on requested products in _product_available
bzr revid: jco@openerp.com-20130718115934-h0nb53e9xd74opju
2013-07-18 13:59:34 +02:00
Christophe Simonis bf29a2ebc7 [MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Christophe Simonis 1e9789baf8 [FIX] base_report_designer: correct "Export To RML" on OSX
bzr revid: chs@openerp.com-20130718111616-apacuhc2qhquobtc
2013-07-18 13:16:16 +02:00
Dharmraj Zala (OpenERP Trainee) 6c063627e6 [FIX] encoded some stirng with utf-8 which could not be converted into ascii
bzr revid: dizzy.zala@gmail.com-20130718094943-xgru5gi07uqq0b5v
2013-07-18 15:19:43 +05:30
Josse Colpaert d820209ea5 [WIP] Add boolean sale on route which is used as a domain for the route on the sales order line
bzr revid: jco@openerp.com-20130718092754-hl8i6rw0dm0che1t
2013-07-18 11:27:54 +02:00
Josse Colpaert bb6b684688 [WIP] Change purchase workflow not to use picking subworkflow
bzr revid: jco@openerp.com-20130718085756-bk3g3fdzgm2bce9p
2013-07-18 10:57:56 +02:00
Thibault Delavallée 486c31af17 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130718084544-jgz0p60kphl8cdc1
2013-07-18 10:45:44 +02:00
Thibault Delavallée 0d68a800e3 [FIX] project_mrp: fixed issue with the state field used in an sql query.
bzr revid: tde@openerp.com-20130718084451-z6us9ajaoli2a28c
2013-07-18 10:44:51 +02:00
Josse Colpaert 2ee6217474 [WIP] Remove auto_validate
bzr revid: jco@openerp.com-20130718072022-hgz2z8i13epyyufy
2013-07-18 09:20:22 +02:00
Launchpad Translations on behalf of openerp dc5b5228db Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717072519-9772wyvh9z6e4g8n
bzr revid: launchpad_translations_on_behalf_of_openerp-20130718071434-7x6sozvlnl6qhb2i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717072525-qqiq08bh7teas3sh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130718071444-zxeebb2ub7nv2zqq
2013-07-18 07:14:44 +00:00
Atul Patel (OpenERP) 6228a12e27 [Merge]: Merged with addons
bzr revid: atp@tinyerp.com-20130718042025-4jn0hldondi7pvjc
2013-07-18 09:50:25 +05:30
Atul Patel (OpenERP) 70d47d809a [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130718041650-rpo69kehswfc8gq4
2013-07-18 09:46:50 +05:30
Josse Colpaert 89ea947460 [WIP] Move unnecessary code from stock.picking because of removing the workflow
bzr revid: jco@openerp.com-20130717160038-4pttaixnsebpy3go
2013-07-17 18:00:38 +02:00
Christophe Simonis 0729f9292f [MERGE][FIX]crm: lead/opp convert/opp wizard: Add salesperson and salesteam in wizard form
bzr revid: chs@openerp.com-20130717154502-2om2l3gzwjyj81nd
2013-07-17 17:45:02 +02:00
Quentin (OpenERP) 47dd8319fa [WIP] refactoring
bzr revid: qdp-launchpad@openerp.com-20130717153639-suq2ges16hbdwb79
2013-07-17 17:36:39 +02:00
Josse Colpaert f6c0f28189 [WIP] Remove workflow from picking and change state towards a calculated field, make sure scheduler assigns the confirmed moves(=mts) that are possible, correction in search rule with routes, add complex routes
bzr revid: jco@openerp.com-20130717152903-713fdbklmxw0zxwb
2013-07-17 17:29:03 +02:00
Christophe Simonis 24ea151a37 merge upstream
bzr revid: chs@openerp.com-20130717142947-de40mn3234gt5044
2013-07-17 16:29:47 +02:00
Christophe Matthieu 8fa171aa0d [FIX] crm_meeting: fix domain evaluation for calendar recursive. (see openerp-web/7.0/revision/3989). Todo: fix recursive when the begin date it's before the domain search date
bzr revid: chm@openerp.com-20130717142325-8lo9el6gk9kgos3d
2013-07-17 16:23:25 +02:00
Thibault Delavallée b49d94408f [FIX] crm: added date_last_stage_update in crm + report
bzr revid: tde@openerp.com-20130717141336-ul8xwlveh3c1w9y9
2013-07-17 16:13:36 +02:00
Quentin (OpenERP) 850498c289 [REV] partially reverted revision 8905 that was partially reverting by mistake revision 8901
bzr revid: qdp-launchpad@openerp.com-20130717135142-0csx6ztnu004yyqj
2013-07-17 15:51:42 +02:00
Quentin (OpenERP) 42e0f4e659 [WIP] negative quants handling
bzr revid: qdp-launchpad@openerp.com-20130717132627-4cbei6m63lq9rr5p
2013-07-17 15:26:27 +02:00
Maxime Chambreuil 72989c1a9d [FIX] reconcile = False on tax accounts
bzr revid: maxime.chambreuil@savoirfairelinux.com-20130717125745-b8p0pn2govdq1qp8
2013-07-17 08:57:45 -04:00
Paramjit Singh Sahota b7160bc1cf [IMP] Improved code for fetch_followers and done as was previously && added condition for the record in display_followers so that it never breaks && improve the mouse-enter and mouse-leave.
bzr revid: psa@tinyerp.com-20130717124842-vuqct26jy6a7palb
2013-07-17 18:18:42 +05:30
Josse Colpaert 1caa112b20 [WIP] search_suitable_rule should be responsible for taking route_ids into account or not
bzr revid: jco@openerp.com-20130717124255-e3a9i0nh85z00895
2013-07-17 14:42:55 +02:00
Thibault Delavallée b802e66079 [IMP] [FIX] ir_actions_server: form view fixes and improvements + some model update to ease the process of creating new server actions.
bzr revid: tde@openerp.com-20130717120936-52f0emxeufinzqg4
2013-07-17 14:09:36 +02:00
Josse Colpaert 208f56c284 [WIP] Add menu for global procurement rules and pass routes to next procurement
bzr revid: jco@openerp.com-20130717113136-l2pj1h6ukfoj153r
2013-07-17 13:31:36 +02:00
Thibault Delavallée 8d292b6f59 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130716082412-ll8kr34qleu4trkh
bzr revid: tde@openerp.com-20130717092938-mpfcwwnb1yojwer0
2013-07-17 11:29:38 +02:00
Thibault Delavallée 48dd55b1e8 [FIX] mail: fixed merge issue, forgottent conflict
bzr revid: tde@openerp.com-20130717085925-l0u2nkvz91wm5kcy
2013-07-17 10:59:25 +02:00
Thibault Delavallée 32d0f6bce0 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130717074710-2jz58nqwe7hnyyij
2013-07-17 09:47:10 +02:00
Thibault Delavallée 4f7afae100 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130717074450-puhtirdoqswf55pl
2013-07-17 09:44:50 +02:00