ffe51235d3
[FIX]product_margin :fix computation of expected_margin and normal_cost in query, it shows wrong value while product id and product_tmpl_id are different
...
bzr revid: mma@tinyerp.com-20121105103612-hoxabvlk083tqsr5
2012-11-05 16:06:12 +05:30
Randhir Mayatra (OpenERP)
da33e29cd9
[IMP] remove the reactive wizard when time estimation group are not selected
...
bzr revid: rma@tinyerp.com-20121105103546-19saqv77olaza4u0
2012-11-05 16:05:46 +05:30
Ajay Chauhan (OpenERP)
29ad7e953e
[FIX] portal_sale: solve warning issue with portal user
...
bzr revid: cha@tinyerp.com-20121105103316-u3xh0zxib4hgxt4i
2012-11-05 16:03:16 +05:30
94b2c85d2a
[FIX]l10n_be_coda : added spaces in account number while doing the check, systems stores account number with spaces and coda file account number does not have space
...
bzr revid: mma@tinyerp.com-20121105103227-9465j8pqr1ludw8u
2012-11-05 16:02:27 +05:30
Mayur Maheshwari (OpenERP)
ce2d38922e
[FIX]l10_be : imp little bit
...
bzr revid: mma@tinyerp.com-20121105102102-sxbu9q584bp7gyfy
2012-11-05 15:51:02 +05:30
Mayur Maheshwari (OpenERP)
81560c12fa
[FIX]hr_payroll : improved some code
...
bzr revid: mma@tinyerp.com-20121105101900-bg5pjmsc5pt957pl
2012-11-05 15:49:00 +05:30
Antonin Bourguignon
602ed5c7ca
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121105101538-tdgu6bi8vp2lnqru
2012-11-05 11:15:38 +01:00
Mayur Maheshwari (OpenERP)
3518a4f2dc
[IMP]10_be : improved code
...
bzr revid: mma@tinyerp.com-20121105101407-fsxjwisg9ajgim07
2012-11-05 15:44:07 +05:30
Xavier Morel
f02c4266d6
[IMP] better logging during import failure
...
bzr revid: xmo@openerp.com-20121105100717-pqexs7j710s2ea2i
2012-11-05 11:07:17 +01:00
Christophe Matthieu
1db87cc080
[IMP] mail: change check_for_destroy method js into check_for_rerender with rerender option
...
bzr revid: chm@openerp.com-20121105100444-yozpfk4xagf8siau
2012-11-05 11:04:44 +01:00
Christophe Simonis
4b494f77f6
merge upstream
...
bzr revid: chs@openerp.com-20121105095621-a88fpp6irnatpzmr
2012-11-05 10:56:21 +01:00
Raphael Collet
52c29ae1c0
[FIX] fields.related._fnct_read: fix handling of type many2one
...
bzr revid: rco@openerp.com-20121105094929-oz7trjzwlqw90499
2012-11-05 10:49:29 +01:00
Tejas Tank
dd12cbe1b6
[IMP] Selection field with placeholder feature.
...
bzr revid: tta@openerp.com-20121105094602-v2a4z4m4mighxgqw
2012-11-05 15:16:02 +05:30
Fabien Meghazi
374a5eeb8f
[IMP] Bring back datetimepicker
...
bzr revid: fme@openerp.com-20121105093933-1nj764zonxv6z33i
2012-11-05 10:39:33 +01:00
Thibault Delavallée
aa89db0142
[MERGE] sync with trunk.
...
bzr revid: tde@openerp.com-20121105093838-bisa65ks22ayeyna
2012-11-05 10:38:38 +01:00
Randhir Mayatra (OpenERP)
241dd4188e
[MERGE] merge with parent branch
...
bzr revid: rma@tinyerp.com-20121105093202-rwm0n5in43bym7ye
2012-11-05 15:02:02 +05:30
Fabien Meghazi
2994db89ca
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121105093013-31veb91zkdeiuddh
2012-11-05 10:30:13 +01:00
Thibault Delavallée
6ecbae4280
[MERGE] Sync with addons/trunk.
...
bzr revid: tde@openerp.com-20121105091342-8d1qutx723tv65dx
2012-11-05 10:13:42 +01:00
Vo Minh Thu
7169f91bc3
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121105090123-difc1iksbnb28mtv
2012-11-05 10:01:23 +01:00
Vijaykumar Baladaniya
17eeb7e740
[FIX]Give a access rule.
...
bzr revid: vba@tinyerp.com-20121105085213-26mi5y3t134o80ci
2012-11-05 14:22:13 +05:30
Fabien Meghazi
22ad7a70f7
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121105084838-gwc7xb19f7131vbi
2012-11-05 09:48:38 +01:00
9e56b3b6a8
[ADD]QuickAdd Move Line View
...
bzr revid: dle@openerp.com-20121105084152-35bvurqkvuv4k0ow
2012-11-05 09:41:52 +01:00
Mayur Maheshwari (OpenERP)
973d784810
[FIX]account_voucher : improved code
...
bzr revid: mma@tinyerp.com-20121105084037-iuqq0l9lln1o9e4j
2012-11-05 14:10:37 +05:30
Raphael Collet
401dd57f30
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20121105083756-jdr9fxp32djpifqk
2012-11-05 09:37:56 +01:00
Raphael Collet
db13e8591a
[FIX] fields.related._fnct_write: handle the case where ids is a single id
...
bzr revid: rco@openerp.com-20121105082259-rcmcjs5n1eimtcpl
2012-11-05 09:22:59 +01:00
Mayur Maheshwari (OpenERP)
fd8f46b39a
[FIX]account_voucher : improved some code
...
bzr revid: mma@tinyerp.com-20121105072021-236ci5s510fx5deq
2012-11-05 12:50:21 +05:30
Hardik
06d98bcbbc
[IMP]Improvement in different modules
...
bzr revid: hsa@tinyerp.com-20121105070408-jygn8tx77lvkzqnb
2012-11-05 12:34:08 +05:30
Mayur Maheshwari (OpenERP)
7637a134e2
[FIX]account_voucher : removed un-used variable
...
bzr revid: mma@tinyerp.com-20121105065327-3x4xqyf88d1tdgwb
2012-11-05 12:23:27 +05:30
1dde3091d2
[FIX]account_voucher : journal entry not balancing from purchase reciept
...
bzr revid: mma@tinyerp.com-20121105065106-195oyhgl3x266r9t
2012-11-05 12:21:06 +05:30
Vishmita
b2965827dc
[FIX]shortcut should highlight when press SHIFT + ALT.
...
bzr revid: vja@tinyerp.com-20121105063518-ng3qk7ljjxmbtuvi
2012-11-05 12:05:18 +05:30
Amit Patel
5c3e56267e
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121105063300-ylbdx03epxui6v2v
2012-11-05 12:03:00 +05:30
9a6e7799fe
[FIX]hr_payroll : Fixed Salary Rules Python Code and Quantity for payslip computation
...
bzr revid: mma@tinyerp.com-20121105062807-byz6d0kd7scxq3r3
2012-11-05 11:58:07 +05:30
Amit Patel
70897759f6
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121105062709-ks3ca7hqvha39nls
2012-11-05 11:57:09 +05:30
Amit Patel
6bc15408d6
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121105062614-q9cao3w2xlh9gbi8
2012-11-05 11:56:14 +05:30
Turkesh Patel (Open ERP)
2913d227f2
[MRG] open marketing menu when marketing installed.
...
bzr revid: tpa@tinyerp.com-20121105061739-2uycmlvlw5dl3pl9
2012-11-05 11:47:39 +05:30
b855f0bdd8
[FIX]l10_be : Wizard thorws error instead of User Friendly Warning
...
bzr revid: mma@tinyerp.com-20121105061518-9zixa8lr22z7v9j5
2012-11-05 11:45:18 +05:30
ajay javiya (OpenERP)
395ee2bc8e
[FIX]:Remove selection widget and add ir.action.todo
...
bzr revid: aja@tinyerp.com-20121105060310-s3uw9o6vmjz37xwu
2012-11-05 11:33:10 +05:30
Vishmita
c470df6de0
[FIX]Improve code
...
bzr revid: vja@tinyerp.com-20121105055320-jrplij0m8y6y2m3e
2012-11-05 11:23:20 +05:30
Rajesh Prajapati (OpenERP)
6bdbd8e4d3
[MERGE] merge with lp:openobject-addons
...
bzr revid: rpr@tinyerp.com-20121105053502-iah2f85j6jl03cpo
2012-11-05 11:05:02 +05:30
Jiten (OpenERP)
77dbc558cf
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20121102111255-wu683od04sr9h8dg
bzr revid: jra@tinyerp.com-20121105051417-pa5spswlxg20xcqx
2012-11-05 10:44:17 +05:30
Ajay Chauhan (OpenERP)
59ba636080
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121105051224-8utjcmre8p0qsc30
2012-11-05 10:42:24 +05:30
Jiten (OpenERP)
fb42b72d4a
[Merge] Merged trunk.
...
bzr revid: jra@tinyerp.com-20121105050954-htnejpf9r4kh59bz
2012-11-05 10:39:54 +05:30
958edad965
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121105044053-iwdfmabj0neffc9o
2012-11-05 04:40:53 +00:00
Divyesh Makwana (Open ERP)
c59bc2aeaa
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121105043421-btw3sbvz278463a2
2012-11-05 10:04:21 +05:30
Divyesh Makwana (Open ERP)
7a5501906a
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121105043247-gejs8bqv6vni7cep
2012-11-05 10:02:47 +05:30
Xavier Morel
b6ce978020
[FIX] avoid overwriting sensible error message with garbage when reading or decoding the CSV file fails
...
also improve error message in case of decoding error (turns out UnicodeDecodeError has everything you need to know exactly what blew up, who knew?)
bzr revid: xmo@openerp.com-20121104192508-62gnf3syv59am4ki
2012-11-04 20:25:08 +01:00
Tejas Tank
c01b17f675
[FIXED] Improved the code to fix the recursion of model to model.
...
bzr revid: tta@openerp.com-20121104130933-urko2zv46114hecf
2012-11-04 18:39:33 +05:30
29fffbc97d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121104045554-ygf95bxx3xy44tm1
2012-11-04 04:55:54 +00:00
Fabien Pinckaers
974ca267cf
[MERGE] fix multi-company for pos
...
bzr revid: fp@openerp.com-20121103172128-rx5lvo5xzmsj9ay1
2012-11-03 18:21:28 +01:00
Fabien Pinckaers
4a15e55895
[FIX] bug pos
...
bzr revid: fp@openerp.com-20121103171627-7mvvn13494ofbbh0
2012-11-03 18:16:27 +01:00
Rifakat (OpenERP)