Commit Graph
55832 Commits
Author SHA1 Message Date
Sanjay Gohel (Open ERP) 7b1790359b [IMP]improve code
bzr revid: sgo@tinyerp.com-20120730062242-60txpib8m7ezv1v1
2012-07-30 11:52:42 +05:30
Sanjay Gohel (Open ERP) 47af4b2c7d [IMP]improve view for inherited button
bzr revid: sgo@tinyerp.com-20120730055756-kie1exivhl152anf
2012-07-30 11:27:56 +05:30
Jigar Amin - OpenERP f2cdadda7a [MERGE] lp:~openerp-commiter/openobject-server/trunk-sloppy-rng-jam-fix-aja
bzr revid: jam@tinyerp.com-20120730053722-lci9q2yqjgj4u1be
2012-07-30 11:07:22 +05:30
Dharti Ratani (OpenERP) 30c11a745b merged with trunk
bzr revid: dhr@tinyerp.com-20120727050148-7mojh5qukwoo38x3
bzr revid: dhr@tinyerp.com-20120730053657-6kck7nl4fl112eue
2012-07-30 11:06:57 +05:30
Divyesh Makwana (Open ERP) 7f285ca09f [IMP] stock : Added a group 'Manage Multiple Locations and Warehouses' to 'Location Structure' menu.
bzr revid: mdi@tinyerp.com-20120730052729-qs42lzpuvifg3tu5
2012-07-30 10:57:29 +05:30
Rucha (Open ERP) 9be1dc63e5 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120730052105-tjzeohx0hyi43qi4
2012-07-30 10:51:05 +05:30
ajay javiya (OpenERP) 74c5af12d5 [IMP]: Improve view validation
bzr revid: aja@tinyerp.com-20120730051446-i5krti4889lwbgcn
2012-07-30 10:44:46 +05:30
Purnendu Singh (OpenERP) 4e8971d7be [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120730050945-jirpezzzeqkg3kdo
2012-07-30 10:39:45 +05:30
Sanjay Gohel (Open ERP) 5eec27172e [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120730050609-vkn1vch5vck9vr6i
2012-07-30 10:36:09 +05:30
Sanjay Gohel (Open ERP) f9d004666e [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120730050431-8ezmnu62k4iz2up7
2012-07-30 10:34:31 +05:30
Ajay Chauhan (OpenERP) 578adbaa73 [Merge] Merge with main addons.
bzr revid: cha@tinyerp.com-20120730050344-12h72zllu45qytix
2012-07-30 10:33:44 +05:30
Launchpad Translations on behalf of openerp 4f15336078 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120730045534-skdqxm52z48qlae1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120730045915-0rv3el9erxc6y6dr
2012-07-30 04:59:15 +00:00
Amit Patel (OpenERP) 0e6f4d8a36 [MERGE]
bzr revid: apa@tinyerp.com-20120730045803-ebbbyzawkgldul09
2012-07-30 10:28:03 +05:30
Amit Patel (OpenERP) f9372111f6 [MERGE]
bzr revid: apa@tinyerp.com-20120730045702-k1b2vjivuyzpabfs
2012-07-30 10:27:02 +05:30
Divyesh Makwana (Open ERP) df01cb6bc1 [IMP] purchase : Improved the code.
bzr revid: mdi@tinyerp.com-20120730045626-016flwiiqh3b43cg
2012-07-30 10:26:26 +05:30
Divyesh Makwana (Open ERP) 4de1e8a16c [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120730042207-bfma715m4mz4f3gp
2012-07-30 09:52:07 +05:30
Divyesh Makwana (Open ERP) 5bb6d5f84a [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120727060937-w4ep661try3tvrm2
bzr revid: mdi@tinyerp.com-20120730042106-on7yr8xww0czfusc
2012-07-30 09:51:06 +05:30
Fabien Pinckaers 70f12f78b8 [IMP] simplifiation of welcome message
bzr revid: fp@openerp.com-20120729151611-wxe4h8inc0ofa4d6
2012-07-29 17:16:11 +02:00
Fabien Pinckaers 9dec7e4110 [IMP] small change in copywriting of intro messages
bzr revid: fp@openerp.com-20120729044721-m1raabv882heiog8
2012-07-29 06:47:21 +02:00
Launchpad Translations on behalf of openerp 0c581831b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045741-hrbggtt37yutrbpx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043802-x7m56po0nxue0jb0
2012-07-29 04:38:02 +00:00
Antonin Bourguignon 5d53bf5982 [IMP] properly name each portal record rule
bzr revid: abo@openerp.com-20120727155039-i1scp2ajd1g08xmn
2012-07-27 17:50:39 +02:00
Antonin Bourguignon 0919b90c45 [ADD] record rule to hide private events
bzr revid: abo@openerp.com-20120727154727-m7f0urztszju678q
2012-07-27 17:47:27 +02:00
Quentin (OpenERP) 234abbc5d6 [IMP] demo data of product categories
bzr revid: qdp-launchpad@openerp.com-20120727154329-2dj5piwce9o5b7ra
2012-07-27 17:43:29 +02:00
Frédéric van der Essen b3f6c148c5 [FIX] point_of_sale: the pos session view was broken
bzr revid: fva@openerp.com-20120727153951-pby5mpquxjixcrj8
2012-07-27 17:39:51 +02:00
Antonin Bourguignon ffb10a71f6 [FIX] typo
bzr revid: abo@openerp.com-20120727152507-ssp55zd4wsyc2cqf
2012-07-27 17:25:07 +02:00
niv-openerp 93cb71c226 [IMP] once more small improvement to cache-control
bzr revid: nicolas.vanhoren@openerp.com-20120727150955-5xx79v2lc8qsk77a
2012-07-27 17:09:55 +02:00
Quentin (OpenERP) cafc24d019 [IMP] demo data for contact's email
bzr revid: qdp-launchpad@openerp.com-20120727150145-95n1yh0jdvd06l4c
2012-07-27 17:01:45 +02:00
Antonin Bourguignon 3bbc7e0efc [ADD] the possibility to show or hide events in the portal
bzr revid: abo@openerp.com-20120727145337-69ey9rcb070kaatj
2012-07-27 16:53:37 +02:00
Antonin Bourguignon f90f7460bf [IMP] put the employee's portal visibility selection in a separate tab
bzr revid: abo@openerp.com-20120727145302-8h18zcqcobsiiblh
2012-07-27 16:53:02 +02:00
Quentin (OpenERP) 43e8f7ce46 [MERGE] staging branch with misc fixes and improvements
bzr revid: qdp-launchpad@openerp.com-20120727143029-4tjz9bzuutzd73hs
2012-07-27 16:30:29 +02:00
Antonin Bourguignon b9606f611b [IMP] rename portal_hr_employee_view.xml into hr_employee_view.xml
bzr revid: abo@openerp.com-20120727142737-322wskysn6rdk2da
2012-07-27 16:27:37 +02:00
Frédéric van der Essen 8bea1218b1 [WIP] resolving conflicts generated by the **** bisect plugin
bzr revid: fva@openerp.com-20120727141228-45h9ir2njvq7hgqd
2012-07-27 16:12:28 +02:00
Frédéric van der Essen 68c2802fd9 [WIP] point_of_sale: adding untracked files before bisect galore
bzr revid: fva@openerp.com-20120727140552-a5b1j344aa60cemp
2012-07-27 16:05:52 +02:00
Antonin Bourguignon faefa5b4e7 [IMP] put groups attribute on delivery orders' form view in order to hide shipping type and auto picking from portal users
bzr revid: abo@openerp.com-20120727140353-0pi01egg5n7rbb8d
2012-07-27 16:03:53 +02:00
niv-openerp 094ecdc453 [FIX] problem with drop downs
bzr revid: nicolas.vanhoren@openerp.com-20120727132653-47y0alrcwtwkwmyv
2012-07-27 15:26:53 +02:00
Christophe Simonis 2025875c7a merge upstream
bzr revid: chs@openerp.com-20120727130947-gkmbu7ykf02c952s
2012-07-27 15:09:47 +02:00
Frédéric van der Essen abbd387400 [MERGE] from trunk
bzr revid: fva@openerp.com-20120727130026-bif1t1mpakepcqe1
2012-07-27 15:00:26 +02:00
Frédéric van der Essen e3c2ae9681 [WIP] point_of_sale: variable length ean prefixes
bzr revid: fva@openerp.com-20120727130010-82ddtyeva3r6l64c
2012-07-27 15:00:10 +02:00
Rucha (Open ERP) 003dfa6454 [IMP]: stock: Improved cases in names of shop, company, partner and warehouse
bzr revid: rpa@tinyerp.com-20120727123634-3nwtl9e3wcevi3z0
2012-07-27 18:06:34 +05:30
Rucha (Open ERP) ce71d656cb [FIX]: stock: Fixed wrong currency code
bzr revid: rpa@tinyerp.com-20120727122716-n9173hx00cvh4o6i
2012-07-27 17:57:16 +05:30
Antonin Bourguignon e3793fd82f [IMP] in the contact form, the e-mail field is always visible and if the current user isn't anonymous, will prefilled with his e-mail
also replace placeholders by labels

bzr revid: abo@openerp.com-20120727122539-5009v5nbsez26eel
2012-07-27 14:25:39 +02:00
Quentin (OpenERP) 922f565eb7 [FIX] mrp: fix of the fix made 2 commits ago about the domain products in mrp orders.
lp bug: https://launchpad.net/bugs/936865 fixed

bzr revid: qdp-launchpad@openerp.com-20120727122440-sju60sv1dqsr1tlm
2012-07-27 14:24:40 +02:00
Rucha (Open ERP) 59c7df686a [IMP]: stock: Improved shop names
bzr revid: rpa@tinyerp.com-20120727121827-dnv7nmuaxhxvnqmd
2012-07-27 17:48:27 +05:30
Rucha (Open ERP) 3072af4960 [IMP]: base: Improved name of main company to "Your company" again
bzr revid: rpa@tinyerp.com-20120727121716-a8c52cpag5bqvyko
2012-07-27 17:47:16 +05:30
Rucha (Open ERP) 9b4d4a599a [IMP]: Improved address of main company
bzr revid: rpa@tinyerp.com-20120727115742-8e7ji8ngz9jtwcgi
2012-07-27 17:27:42 +05:30
Rucha (Open ERP) 9f8a9829d1 [FIX]: product: Fixed string in pricelist yml
bzr revid: rpa@tinyerp.com-20120727112228-ymvm6feasi0jieek
2012-07-27 16:52:28 +05:30
Rucha (Open ERP) db8991e3c7 [IMP]: product: Improved product categories structure and related changes
bzr revid: rpa@tinyerp.com-20120727112025-2t75kivor8pcm2b8
2012-07-27 16:50:25 +05:30
niv-openerp 4fca220ff1 Fixed focus problems
bzr revid: nicolas.vanhoren@openerp.com-20120727095517-xxpinz8iw5zisvaj
2012-07-27 11:55:17 +02:00
Rucha (Open ERP) 7c78988fce [REM]: base: Removed tags(category) from contacts
bzr revid: rpa@tinyerp.com-20120727094314-9sqyoi7xjh2i755v
2012-07-27 15:13:14 +05:30
Vo Minh Thu 45951a0a49 [FIX] I AM IN YUR TRNK FIXIN YUR BUGS.
bzr revid: vmt@openerp.com-20120727093401-fao4a7dvpa3fkcjn
2012-07-27 11:34:01 +02:00