Commit Graph

549 Commits

Author SHA1 Message Date
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Martin Trigaux dbe9e41257 [IMP] account: unify wizard view for chart of analytic accounts with other wizards
bzr revid: mat@openerp.com-20130902121412-m6ovn2yt4bngbfns
2013-09-02 14:14:12 +02:00
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Martin Trigaux 091b921ad0 [MERGE] [FIX] account: don't display fields from analytic accounting after removal
bzr revid: mat@openerp.com-20130613135959-185y4ip2csobdpgt
2013-06-13 15:59:59 +02:00
Olivier Dony 0f983a0146 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183
rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll

bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc
2013-06-03 14:18:52 +02:00
Martin Trigaux 0ed5316c29 [MERGE] [FIX] account: Grouping on field 'template_id' is not possible because that field does not appear in the list view
bzr revid: mat@openerp.com-20130528122036-e08b5j358u5u6r4j
2013-05-28 14:20:36 +02:00
Olivier Dony 325f710360 [FIX] account: split the actions to open analytic accounts, as context is not compatible
The same action was erroneously used in two incompatible
cases: once for openining the list of analytic accounts
from a partner form view (requires a special context
with a client-side `active_id` variable) and the second
one for the main Analytic Account menu item (which
cannot have `active_id` in the context - it would crash).

The fix includes setting an empty ({}) context explicitly
on the original action to be sure the incorrect context
is removed upon update.


The error was introduced at rev.8685
revid:qdp-launchpad@openerp.com-20130418125951-8p0tfexd9jj8l75b

bzr revid: odo@openerp.com-20130507165113-67lam91046t56ky8
2013-05-07 18:51:13 +02:00
Quentin (OpenERP) 33f27b362b [MERGE] forward port of addons v7 up to revision 9045
bzr revid: qdp-launchpad@openerp.com-20130422153449-c62emljfa4a49758
2013-04-22 17:34:49 +02:00
Olivier Dony feefb0ad36 [FIX] search views: use child_of operator for partner_id fields that can reference both companies and contacts
The goal is to match both the Company and its contacts
when searching for the Company

bzr revid: odo@openerp.com-20130420022642-6qe8pp4ifexjms65
2013-04-20 04:26:42 +02:00
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Ravish (Open ERP) 5a4dcc4819 analytic journal must follow analytical group
bzr revid: rmu@tinyerp.com-20130405043510-cxannthx2gkm35a6
2013-04-05 10:05:10 +05:30
Vo Minh Thu 245f0fe9f8 [REF] account: removed openerp.pooler imports.
bzr revid: vmt@openerp.com-20130327134337-rpktoa5gj31iof5c
2013-03-27 14:43:37 +01:00
Hardik Ansodariya 004fb6af7f [FIX] account: The buttons of the Chart of analytic account appear on top, that should be in footer like all other wizards (Maintenance case: 590131)
bzr revid: han@tinyerp.com-20130322054456-27wjh8c78sfijw4b
2013-03-22 11:14:56 +05:30
Fabien Pinckaers c7d709e579 [FIX] misc fixes on contracts, timesheets
bzr revid: fp@openerp.com-20130312123321-mly0k9lrh3im78bg
2013-03-12 13:33:21 +01:00
Antony Lesuisse 386b3d4bd5 [FIX] analytic lines show the user_id
bzr revid: al@openerp.com-20130224192155-gqivv3378csdbvjo
2013-02-24 20:21:55 +01:00
Antony Lesuisse 77477a5e2d [FIX] contract search view
bzr revid: al@openerp.com-20130214193741-a4yoc33k7ptmkhui
2013-02-14 20:37:41 +01:00
Somesh Khare (OpenERP) dc2f67510c [FIX] account: Grouping on field 'template_id' is not possible because that field does not appear in the list view (Case; ref 586077)
bzr revid: skh@tinyerp.com-20130213125719-o5virat3zowaio3p
2013-02-13 18:27:19 +05:30
Antony Lesuisse b1da131ba2 Analytic accounts contract search view
bzr revid: al@openerp.com-20130205100223-b3ws7t9hnq9xf9x2
2013-02-05 11:02:23 +01:00
Antony Lesuisse 822be047d8 [IMP] analytic search
bzr revid: al@openerp.com-20130204174816-ogz1tyodoske8dkr
2013-02-04 18:48:16 +01:00
Antony Lesuisse ba65ad2422 [FIX] contract show date_start
bzr revid: al@openerp.com-20121229044248-psypv1fhsg5rfash
2012-12-29 05:42:48 +01:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Fabien Pinckaers 83ba082313 [iMP] contract, add customer name
bzr revid: fp@tinyerp.com-20121211140332-rntjhtn1nxppizvk
2012-12-11 15:03:32 +01:00
dle@openerp.com 3960f9ff7b [FIX]Chart of analytic account parent not displayed in toolbar
bzr revid: dle@openerp.com-20121211091902-64yeeqwsqb6qpwd2
2012-12-11 10:19:02 +01:00
Fabien Pinckaers ed0355a6b7 [IMP] better contract search view
bzr revid: fp@tinyerp.com-20121210193951-ewpv561fq2tbvxuw
2012-12-10 20:39:51 +01:00
Fabien Pinckaers 2f96683e20 [IMP] contract management
bzr revid: fp@tinyerp.com-20121210192810-eff3qaqn90vgl5q3
2012-12-10 20:28:10 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Ajay Chauhan (OpenERP) 23020e0551 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121102101838-k560rdxps9o3akob
2012-11-02 15:48:38 +05:30
Fabien Pinckaers 726a8e6c10 [MERGE] useability improvement
bzr revid: fp@tinyerp.com-20121102083612-xb2qvaqhgxunfipg
2012-11-02 09:36:12 +01:00
Mayur Maheshwari (OpenERP) d206baaf0f [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121030052101-fcx92io1a4i3v8wp
2012-10-30 10:51:01 +05:30
Mayur Maheshwari (OpenERP) dffecdaf84 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121023071427-2nkrdwixs4gsyg6a
2012-10-23 12:44:27 +05:30
Saurang Suthar 602d96b45e [MERGE] merge with lp:openobject-addons
bzr revid: ssu@tinyerp.com-20121022084635-lun43msy3ljr4srt
2012-10-22 14:16:35 +05:30
Amit Patel cb3ec02e38 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121016092623-k9eoa8d35qnoihla
bzr revid: apa@tinyerp.com-20121017071203-bf3fgejxon2cnp8u
bzr revid: apa@tinyerp.com-20121022051737-ke16gc4y6rl8fqs9
2012-10-22 10:47:37 +05:30
Mayur Maheshwari (OpenERP) 35f0c86380 [IMP]account : improve little bit
bzr revid: mma@tinyerp.com-20121019095742-1sy25hyjqkntac0o
2012-10-19 15:27:42 +05:30
Mayur Maheshwari (OpenERP) 70e95c793b [IMP]account : improve little bit
bzr revid: mma@tinyerp.com-20121019094505-i0g7zeuwj230ftox
2012-10-19 15:15:05 +05:30
Mayur Maheshwari (OpenERP) 47419788ca [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121016055745-eb1l2lfwgv2b0hbc
bzr revid: mma@tinyerp.com-20121018054042-xbc4y194y5nmsklc
bzr revid: mma@tinyerp.com-20121019052843-972s2b2y08cbs9vo
2012-10-19 10:58:43 +05:30
pankita shah (Open ERP) e48e2a42dc [IMP] warning mesage and fix traceback ehen click chanwork button
bzr revid: atp@tinyerp.com-20121015054845-myi61ts7o2p4bg1e
bzr revid: atp@tinyerp.com-20121016175913-lbq3ymr9y7qz0tae
bzr revid: shp@tinyerp.com-20121018105933-c40om6nmwjw2xz7s
2012-10-18 16:29:33 +05:30
Saurang Suthar a36b0289e4 [IMP]account:added on change method in form view of Time & Costs to Invoice
bzr revid: ssu@tinyerp.com-20121016095831-wvbwr174kzql3f2a
2012-10-16 15:28:31 +05:30
Amit Patel b2772b2f15 [FIX]:When creating a task work to invoice:
- the product and journal must be set by default according to the user
 - the invoicing 100% must be set by default too and the uom, journal

bzr revid: apa@tinyerp.com-20121015104402-u8ht0hbfsvez00j8
2012-10-15 16:14:02 +05:30
Khushboo Bhatt (Open ERP) a35b5a7f02 [ADD]added on_change on field
bzr revid: kbh@tinyerp.com-20121015094057-n4l3xei6o417dh1o
2012-10-15 15:10:57 +05:30
Fabien Pinckaers 18e9a26087 [MERGE] analytic journals and budgets
bzr revid: fp@tinyerp.com-20121013111553-bu3j3rdxptunzytz
2012-10-13 13:15:53 +02:00
Mayur Maheshwari (OpenERP) 691cd8bff3 [IMP]account : improve Demo data ,chatter message and remove filter Manager from analytic account serch view
bzr revid: mma@tinyerp.com-20121011124600-n74lo8a0t11kr7jv
2012-10-11 18:16:00 +05:30
Amit Patel 55f6972136 [IMP]:improved code
bzr revid: apa@tinyerp.com-20121009051848-enmsnu9d9pd69ujl
2012-10-09 10:48:48 +05:30
Randhir Mayatra (OpenERP) 0c82264ebb [IMP] improve the code of analytic account report
bzr revid: rma@tinyerp.com-20121009050732-zu0lg58qcr9ab3xx
2012-10-09 10:37:32 +05:30
Randhir Mayatra (OpenERP) 8eb2ab20a2 [IMP]improve the code
bzr revid: rma@tinyerp.com-20121008122102-gmrl5mfs5dcjd4k6
2012-10-08 17:51:02 +05:30
Randhir Mayatra (OpenERP) eaad4bfbfd [IMP] make changes into the account_analytic_journal file
bzr revid: rma@tinyerp.com-20121008110752-iifox2qnqap9s0pa
2012-10-08 16:37:52 +05:30
pankita shah (Open ERP) 529b8c9e64 [FIX] widget is undefined when press cost and revenus
bzr revid: shp@tinyerp.com-20121005065508-4axokyk4llathg21
2012-10-05 12:25:08 +05:30
Atul Patel (OpenERP) f715525300 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121003064028-49llvt047893tx2n
2012-10-03 12:10:28 +05:30
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Atul Patel (OpenERP) 0d80ceda1a [MERGE]: Merged nco branch for display amount with currency symbol using formatLang
bzr revid: atp@tinyerp.com-20121001194847-mgepvrrgwi6ifnlh
2012-10-02 01:18:47 +05:30
Nimesh (Open ERP) a9676cfd8c [IMP] amout with currency.
bzr revid: nco@tinyerp.com-20121001110802-r3l169i2ka73t2rh
2012-10-01 16:38:02 +05:30