Commit Graph

52 Commits

Author SHA1 Message Date
Quentin (OpenERP) 70eb74a260 [MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
Olivier Dony c3e812f34a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10025 rev-id odo@openerp.com-20140430102552-qkwv20b20nve64th
bzr revid: odo@openerp.com-20140430110048-6971xplq8k073tto
2014-04-30 13:00:48 +02:00
Denis Ledoux 986e466bf2 [FIX] multi_company: set currency of OpenERP US to USD in the demo data
bzr revid: dle@openerp.com-20140425133421-czisl2dpm5hletts
2014-04-25 15:34:21 +02:00
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Christophe Matthieu b100726312 [FIX] product: remove data demo of product in multi_company module; fix product images storage
bzr revid: chm@openerp.com-20140109152621-vduwsnm2hbm9nwop
2014-01-09 16:26:21 +01:00
bth-openerp 8ed6aa96d7 [IMP]Improved code to company true.
bzr revid: bth@tinyerp.com-20131115101647-g5h3n545730qorbz
2013-11-15 15:46:47 +05:30
bth-openerp dc28911884 [IMP] Added email address.
bzr revid: bth@tinyerp.com-20131113132923-o39abguuq2d1he7l
2013-11-13 18:59:23 +05:30
bth-openerp 0e7b2ae453 [IMP]For Supplier create supplier invoice instead of customer invoice, added address for partners.
bzr revid: bth@tinyerp.com-20131113130107-ksbg3xy4jy26kbn7
2013-11-13 18:31:07 +05:30
bth-openerp 596da49acc [IMP]Improved demo data for company.
bzr revid: bth@tinyerp.com-20131108133801-64wluz06og52mad3
2013-11-08 19:08:01 +05:30
Josse Colpaert 30f27b8cbb [IMP] Move route_ids from product from stock_location to stock and remove supply_method (change with route)
bzr revid: jco@openerp.com-20130909115515-7z6ixaxe7bpxxe73
2013-09-09 13:55:15 +02:00
Xavier Morel aeac3e9582 [REM] yet more nonsensical @model + @ref
bzr revid: xmo@openerp.com-20130429130403-x13kcbevqyegfjuy
2013-04-29 15:04:03 +02:00
Denis Ledoux dle@openerp.com e18841b518 [DEL]Missed view_id ref in multi_company/multi_company_demo.xml
bzr revid: dle@openerp.com-20121122123716-lohu4xuhjd2nzm4c
2012-11-22 13:37:16 +01:00
Amit Patel a0de0c7e46 [IMP]:improved demo data
bzr revid: apa@tinyerp.com-20120917114022-ik1klx01aou35srb
2012-09-17 17:10:22 +05:30
Cecile Tonglet 86e9df4c9c [FIX] Multicompany demo users
bzr revid: cto@openerp.com-20120831170356-tgtyr7mipknzpohm
2012-08-31 19:03:56 +02:00
Rucha (Open ERP) 628626fd85 [IMP]: project*: Improved xml_id of demo tasks
bzr revid: rpa@tinyerp.com-20120807092330-df2ax9e3q4qpc3go
2012-08-07 14:53:30 +05:30
Rucha (Open ERP) 1dab436b8d [IMP]: project*: Improved xml_id of demo project
bzr revid: rpa@tinyerp.com-20120807092031-xhwx7ei3equqw275
2012-08-07 14:50:31 +05:30
Rucha (Open ERP) a9cdfad12a [IMP]: product: Changed xml_id of product category in data file to identify this record easily when accessing from py
bzr revid: rpa@tinyerp.com-20120726131700-ob1unjqwpaqns7nx
2012-07-26 18:47:00 +05:30
Rucha (Open ERP) 0cbf2d0e72 [IMP]: multi_company: Fixed main partner name overriden in multicompany module
bzr revid: rpa@tinyerp.com-20120718131631-qy4z1jfk1i4j636m
2012-07-18 18:46:31 +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) 40f83805c5 [IMP]: product: Improved reference of demo product xml_id from static names to number (work in progress)
bzr revid: rpa@tinyerp.com-20120629110424-xykxjjq7sn50ovww
2012-06-29 16:34:24 +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) 0aaef8a06e [IMP]: Improved partner demo xml_id referenced based on changes in server
bzr revid: rpa@tinyerp.com-20120620120305-g88c9cp55csnsvoc
2012-06-20 17:33:05 +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
Raphael Collet 72a685bc8e [IMP] multi_company, point_of_sale: remove group_extended
bzr revid: rco@openerp.com-20120425144611-hk2y9euk5kigqx46
2012-04-25 16:46:11 +02:00
Antony Lesuisse 80257ecb89 [FIX] project demo data
bzr revid: al@openerp.com-20111109014338-5w86vhjpcsz59dre
2011-11-09 02:43:38 +01:00
Antony Lesuisse 45be4946a9 [MERGE] project data demo, remove some useless tasks, add stages
bzr revid: al@openerp.com-20111108210338-0wm9d306v17fz4qf
2011-11-08 22:03:38 +01:00
Mayur Maheshwari (OpenERP) 4c81cfbebd [IMP]multi_company,purchase:Remove a demo data and sql constraint
bzr revid: mma@tinyerp.com-20110720115235-k3grrx9ast556sj1
2011-07-20 17:22:35 +05:30
mayur maheshwari (Open ERP) 0890da7353 [FIX]multi_company,purchase:created a sequence for purchase order and demo data for company shop1 and shop2
lp bug: https://launchpad.net/bugs/787052 fixed

bzr revid: mma@tinyerp.com-20110617131808-dx8387t60fzebzv2
2011-06-17 18:48:08 +05:30
Quentin (OpenERP) a90aeb8c4a [REF] account: refactored the creation of journals in the generation from templates wizard, removed old deprecated boolean 'refund_journal' on account.journal (use the type field instead)
bzr revid: qdp-launchpad@openerp.com-20110303145900-8ghspjidwb540mhp
2011-03-03 15:59:00 +01:00
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
ARA (OpenERP) fd80801b32 [FIX]multi_company: Failed to install module multi_company
lp bug: https://launchpad.net/bugs/697989 fixed

bzr revid: ara@tinyerp.com-20110107132149-ajfejzv0lu5ypgfz
2011-01-07 18:51:49 +05:30
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
psi (Open ERP) 3d38b13c05 [FIX] multi_company: rename journal code in demo data
lp bug: https://launchpad.net/bugs/665326 fixed

bzr revid: psi@tinyerp.co.in-20101104090845-r59gdqrebmqs78o7
2010-11-04 14:38:45 +05:30
psi (Open ERP) ce59392805 [FIX] multi_company: Add journals in demo data
lp bug: https://launchpad.net/bugs/665326 fixed

bzr revid: psi@tinyerp.co.in-20101104073509-h870vh8m34r9dqvi
2010-11-04 13:05:09 +05:30
Rvo (Open ERP) 45a8d54f18 [CLEAN]: removed commented code, fixed proper indentation in dictionary and removed extra spaces at few places
bzr revid: rvo@tinyerp.co.in-20100813122005-qj1l1iumkfmocyvk
2010-08-13 17:50:05 +05:30
AMP (OpenERP) 429e0c8031 [MOD] html l10n_be multi_company: usability improvement in access rights
bzr revid: amp@tinyerp.com-20100807073417-539w28sns7bu6oaw
2010-08-07 13:04:17 +05:30
Christophe Simonis f692c09978 [FIX] complete the res.users objects to respect the new constraint on company_id
bzr revid: chs@openerp.com-20100507160535-yjs1g45d36w3m59p
2010-05-07 18:05:35 +02:00
uco (OpenERP) dee4267f0d [REF] multi_company: Changed demo data for currency field.
bzr revid: uco@tinyerp.co.in-20100308133348-l652716g09z3aa0v
2010-03-08 19:03:48 +05:30
uco (OpenERP) b5056e2c9f [FIX] multi_company: Fixed the problem of demo data.
bzr revid: uco@tinyerp.co.in-20100308123434-fjhgd3jiqacfedbx
2010-03-08 18:04:34 +05:30
rpa (Open ERP) bc2da26c80 [IMP]: Changes for reference for crm_configuration
bzr revid: rpa@tinyerp.com-20091204142715-oiu54nom2zlbb6i4
2009-12-04 19:57:15 +05:30
fabian 9cc171f3ef [REM] Removed company wise prices in product (it should use pricelist instead)
[ADD] Added company_id fields in multiple models
[ADD] Added multicompany management for invoice, sale, mrp and stock (it now passes the company_id from ressource to ressource)
[FIX] Fixed default company method
[ADD] Added multicompany rules to demo datas

bzr revid: fabian@fabian-openerp-20091201145418-upu1kghhvrk4yuzy
2009-12-01 15:54:18 +01:00
Fabien Pinckaers 54e1058afd [imp] multi-company groups
bzr revid: fp@tinyerp.com-20091125175023-hmi1msewn9ehb3f2
2009-11-25 18:50:23 +01:00
fabian c2cdc7a56a [IMP] Added group to multicompany users
bzr revid: fabian@fabian-openerp-20091125171735-scluytlq387s4va7
2009-11-25 18:17:35 +01:00
Jay (Open ERP) 4f5cd404eb [FIX] Multi_company : Improved demo data
bzr revid: jvo@tinyerp.com-20091125060502-uf09eyf22q2yxqla
2009-11-25 11:35:02 +05:30
fabian e1e9f45100 [IMP] Added company_id fields for multicompany management
[IMP] Improved demo datas for mutlicompany

bzr revid: fabian@fabian-openerp-20091124171516-c7dwf40yfi9wm2mu
2009-11-24 18:15:16 +01:00
gpa ac0348f28a [IMP]account,hr_timesheet_sheet,product,project,purchase,sale modules: company_id [ADD] multi_company module.
bzr revid: gpa@gpa-desktop-20091120134742-xzwscqyhzxsbijt5
2009-11-20 19:17:42 +05:30
Fabien Pinckaers 1d5ade4b22 removed mc
bzr revid: fp@tinyerp.com-20080824144011-ifafk01ml5e44578
2008-08-24 16:40:11 +02:00
Fabien Pinckaers 4bb0246a56 New Menus Definitions
bzr revid: fp@tinyerp.com-9fddab2e4b601123b2e476f27bb0bbbd5b470b0d
2008-07-01 15:58:58 +00:00
stw c60cae0a8c reindent all xml files
bzr revid: stw-c7b064849fe1f51bf264dd2de76920ded909d158
2008-06-29 08:26:07 +00:00
Mantavya Gajjar c5b1fbc478 ACCOUNT: add multi-company into base accounting
bzr revid: mga@tinyerp.com-9d1120f18bae244eeb46ca3a8f00919a8498058b
2007-03-28 14:41:48 +00:00