Commit Graph

56 Commits

Author SHA1 Message Date
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Twinkle Christian (OpenERP) 721adad01e [IMP]Remove type field from the whole hr module
bzr revid: tch@tinyerp.com-20120808124839-ecd1uic8mscg3s7f
2012-08-08 18:18:39 +05:30
Rucha (Open ERP) 4eb76030a6 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Stephane Wirtel 9f299d9a20 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_module_desc-psi
bzr revid: stw@openerp.com-20120724080711-6655pbbfubiau3li
2012-07-24 10:07:11 +02:00
Purnendu Singh (OpenERP) 2e2f7188d3 [MERGE, IMP] improve and merge cha branch to update desc formatting
bzr revid: psi@tinyerp.com-20120716094548-xx1ip3eljal3ffvl
2012-07-16 15:15:48 +05:30
Rucha (Open ERP) 0fbc2290f2 [FIX]: event_sale: Fixed wrong reference in event_sale yml
bzr revid: rpa@tinyerp.com-20120716061447-qu8h7uwtgra9i1xh
2012-07-16 11:44:47 +05:30
Rajesh Prajapati (OpenERP) 71122ae47a [IMP]tooltip : I have changed the tooltip of fields as suggested
bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
2012-07-13 15:47:51 +05:30
Pinakin Nayi (OpenERP) 62e4a52f2d [IMP]edi-event-email_template-fetchmail-warning-msg
bzr revid: pna@tinyerp.com-20120712122459-hvvxq5nqrtfxv3ei
2012-07-12 17:54:59 +05:30
Ajay Chauhan (OpenERP) 3e94213845 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120712114535-4a6ge109hskz0gcq
2012-07-12 17:15:35 +05:30
Rucha (Open ERP) 4321bcdf30 [IMP]: sale: Improved xml_id reference names for sale order and order lines (work in progress)
bzr revid: rpa@tinyerp.com-20120711103549-67ne83p5jw188k3h
2012-07-11 16:05:49 +05:30
Rucha (Open ERP) 237173eeff [IMP]: product: Improvement in product category demo, improved xml_id refereneces (work in progress)
bzr revid: rpa@tinyerp.com-20120628093001-k113siqn5sbp3xf2
2012-06-28 15:00:01 +05:30
Rucha (Open ERP) 44f33159f8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120627072740-9r33jajghcp10m91
2012-06-27 12:57:40 +05:30
Rucha (Open ERP) 189fd8e390 [IMP]: (Work in progress)* Changed demo references according to changes in server, Aim is to add more common names and easy demo.
* Improved xml_id of demo like res_partner_1 instead of specific record name like res_partner_asus so in future we can change that record value easily avoiding confusions in names

bzr revid: rpa@tinyerp.com-20120619071624-3d9mcl9m76gp2s0c
2012-06-19 12:46:24 +05:30
Kuldeep Joshi (OpenERP) f7db94c2c5 [IMP]event_sale: remove contact_id
bzr revid: kjo@tinyerp.com-20120613120838-0rhk8aeq1mmt47m0
2012-06-13 17:38:38 +05:30
Fabien Pinckaers 3f31dd0d0c [merge] events
bzr revid: fp@tinyerp.com-20120525072114-x1ylvnbw2k3twbhy
2012-05-25 09:21:14 +02:00
Atul Patel (OpenERP) e21492a8bf [REM]: Remove unused code and refactor code as per specification
bzr revid: atp@tinyerp.com-20120523134448-9vqtiufzjgmmaq0b
2012-05-23 19:14:48 +05:30
Atul Patel (OpenERP) 2d0d1d71ce [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120523133425-ip2oenlcl635wu34
2012-05-23 19:04:25 +05:30
Atul Patel (OpenERP) 4a02e98d42 [FIX]: Add osv memory wizard for event preview.Refactor code as per new specification.
bzr revid: atp@tinyerp.com-20120521132458-xozrh3vcz4wbo6t5
2012-05-21 18:54:58 +05:30
Mayur Maheshwari (OpenERP) ea859f54c8 [IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
Atul Patel (OpenERP) 986e134ab4 [ADD]: Load script from web to addons and set indentations for google maps.
bzr revid: atp@tinyerp.com-20120511125434-pwz2hqbgxtmrurgy
2012-05-11 18:24:34 +05:30
Vidhin Mehta (OpenERP) 32ecb048dc [IMP]perfect indentation.
bzr revid: vme@tinyerp.com-20120511120306-j72jwc1mm8kfdsq4
2012-05-11 17:33:06 +05:30
Vidhin Mehta (OpenERP) b0a13bff67 [IMP]load script from addons side.
bzr revid: vme@tinyerp.com-20120511114513-bfco3w7u0itaq171
2012-05-11 17:15:13 +05:30
Atul Patel (OpenERP) 9dc92d18d5 [Add]: Add css file into event_sale modules.
bzr revid: atp@tinyerp.com-20120509173839-q3y5egsp8xliyfvi
2012-05-09 23:08:39 +05:30
Atul Patel (OpenERP) 9ea1132374 [FIX]: Change model_id in security access right.
bzr revid: atp@tinyerp.com-20120509120011-f4224eeji0m8ix05
2012-05-09 17:30:11 +05:30
Atul Patel (OpenERP) d2faa8c8ea [ADD]: ADD security files
bzr revid: atp@tinyerp.com-20120509114357-ikyou2uf4uo3iwhd
2012-05-09 17:13:57 +05:30
Atul Patel (OpenERP) 042e72de8d [FIX]: Fix alignment in kanban view. add accessrights for event.items.
bzr revid: atp@tinyerp.com-20120509114210-r3tp1nnn5rvoipqy
2012-05-09 17:12:10 +05:30
Atul Patel (OpenERP) 7a087d6240 [FIX]: Remove page view from form view and place it into event_sale module.
bzr revid: atp@tinyerp.com-20120507101032-e9q0u4cgng231i62
2012-05-07 15:40:32 +05:30
Atul Patel (OpenERP) 80a595d631 [FIX]: Remove unused space.
bzr revid: atp@tinyerp.com-20120505180349-tlrsdqqpjpm1haaf
2012-05-05 23:33:49 +05:30
Atul Patel (OpenERP) 0a09dbed34 [FIX]: Improve css file. Improve view.
bzr revid: atp@tinyerp.com-20120505173340-1jmgy4clza1gy6sh
2012-05-05 23:03:40 +05:30
Atul Patel (OpenERP) aab3d7379d [MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-event_improvements-atp-event_page_with_google_map-nco
bzr revid: atp@tinyerp.com-20120504133632-qes40ecp3t17zcnv
2012-05-04 19:06:32 +05:30
Nimesh (Open ERP) bfe0509846 [imp] add the event page view for user
bzr revid: nco@tinyerp.com-20120504113136-ws9nxquin9sk95vu
2012-05-04 17:01:36 +05:30
Vidhin Mehta (OpenERP) 882e8152b8 [Merge]merge with trunk.
bzr revid: vme@tinyerp.com-20120502071056-k25tot1on576bvjx
2012-05-02 12:40:56 +05:30
Atul Patel (OpenERP) 2d6fba0621 [ADD]: Add event_items one2many fields into event form view.
bzr revid: atp@tinyerp.com-20120502070722-3twkfw14q89nznuo
2012-05-02 12:37:22 +05:30
Atul Patel (OpenERP) 4443f39f38 [FIX]: Fix some code error. add security rules for event module
bzr revid: atp@tinyerp.com-20120430094454-hcz6w2xvllg7g2b7
2012-04-30 15:14:54 +05:30
Atul Patel (OpenERP) 8d91d9a580 [IMP]: Improve code . remove unused code.
bzr revid: atp@tinyerp.com-20120430073903-52rcd0khdkcyx292
2012-04-30 13:09:03 +05:30
Atul Patel (OpenERP) 49ca301bd6 [MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-event_improvements-atp-event_pageview-nco with some changes
bzr revid: atp@tinyerp.com-20120429180729-nscqe9nix9am0367
2012-04-29 23:37:29 +05:30
Nimesh (Open ERP) 66814b5501 [imp] event : remove unused code.
bzr revid: nco@tinyerp.com-20120427094634-foba34c88a4mn2ja
2012-04-27 15:16:34 +05:30
Nimesh (Open ERP) fa10c5cec7 [imp] change the event view.
bzr revid: nco@tinyerp.com-20120427093242-o9srduq715lbqt8t
2012-04-27 15:02:42 +05:30
Raphael Collet 549e2f5064 [IMP] association, auction, event, idea, marketing, membership, subscription, survey: remove group_extended
bzr revid: rco@openerp.com-20120425143528-gat2f4cdotqv1x06
2012-04-25 16:35:28 +02:00
Atul Patel (OpenERP) a85f78a48b [ADD]event_sale: Add event_items fields for product_ids and sales_ends fields.
bzr revid: atp@tinyerp.com-20120402062817-yjd1pay0kqolv8fe
2012-04-02 11:58:17 +05:30
Amit Patel (OpenERP) 9f137659c4 [FIX]:ValueError: No such external ID currently defined in the system: event.event_type_4
bzr revid: apa@tinyerp.com-20120322095352-duinua5esddclxw5
2012-03-22 15:23:52 +05:30
Quentin (OpenERP) d0c2d2c45f [FIX] event_sale: fields set back to invisible on sale.order.line
bzr revid: qdp-launchpad@openerp.com-20120312114602-ckonmf9044u1m4ej
2012-03-12 12:46:02 +01:00
Quentin (OpenERP) 6a5e210d49 [IMP] event_sale: better demo data
bzr revid: qdp-launchpad@openerp.com-20120312114404-2ter4n11mkyy85gh
2012-03-12 12:44:04 +01:00
MVA f225b93634 [FIX] creating a module to solve conflict problem between sale_layout and event_sale and add a product event demo
bzr revid: mva@openerp.com-20120301162513-iixce1y7fasknb0y
2012-03-01 17:25:13 +01:00
MVA f96d4871ef [FIX] change evnent with event_id in the event_sale test
bzr revid: mva@openerp.com-20120229083431-jdnpm390xq2l5h3d
2012-02-29 09:34:31 +01:00
Quentin (OpenERP) beb4a61f6b [IMP] event_sale: event_type_id is not required anymore on products + small refactoring
bzr revid: qdp-launchpad@openerp.com-20120228163823-1t1qodlyj3nnksfu
2012-02-28 17:38:23 +01:00
Quentin (OpenERP) 5806856a7e [REF] event_sale: added comment
bzr revid: qdp-launchpad@openerp.com-20120228115904-1dm8wnhw2dw221ss
2012-02-28 12:59:04 +01:00
Quentin (OpenERP) 591fe52a37 [IMP] event_sale: better usability (as per our usability expert review) + better naming of files
bzr revid: qdp-launchpad@openerp.com-20120228105906-ubqfrhma81wdd44n
2012-02-28 11:59:06 +01:00