5f5019db0b
[IMP] holidays
...
bzr revid: nel@tinyerp.com-20100707083716-murdgyn8a47yebu4
2010-07-07 10:37:16 +02:00
mtr
4aa0e897e5
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20100707073814-34uuosy3gxyczrma
2010-07-07 13:08:14 +05:30
Mustufa Rangwala
83ba3d8d57
[MERGE] merge with trunk addons
...
bzr revid: mra@mra-laptop-20100707072329-a8i1kjgfkq01gov5
bzr revid: mra@mra-laptop-20100707072952-icky8eh91gx67ytm
2010-07-07 12:59:52 +05:30
Harry (OpenERP)
31503e3db8
[FIX] remove security rule of osv_memory object
...
bzr revid: hmo@tinyerp.com-20100707072453-3w0kw505tbit7h8l
2010-07-07 12:54:53 +05:30
Mustufa Rangwala
6b9d9b5e6a
[MERGE] Merge from trunk dev3 branch:
...
[IMP] hr: Clean
[FIX] sale_margin: Fix onchange on sale order line
bzr revid: mra@mra-laptop-20100707072118-ubpopgr1g2uihzg6
2010-07-07 12:51:18 +05:30
Mustufa Rangwala
8f25bde3bb
[MERGE] merge with trunk addons
...
bzr revid: mra@mra-laptop-20100707071629-l6mro8u6bvh2rwtl
2010-07-07 12:46:29 +05:30
Mustufa Rangwala
a2a631f4ce
[FIX] sale_margin: fix
...
bzr revid: mra@mra-laptop-20100707071323-lllc9ow3rad5djal
2010-07-07 12:43:23 +05:30
Mustufa Rangwala
e4ed76cd59
[IMP] Clean for 6.0
...
bzr revid: mra@mra-laptop-20100707070442-ztxuj718txuro9u1
2010-07-07 12:34:42 +05:30
rpa (Open ERP)
11b7a2d1e5
[ADD]: crm: Applied changes for lead demo that were reverted in some merge
...
bzr revid: rpa@tinyerp.com-20100707070332-b96ctk70q21zo8lx
2010-07-07 12:33:32 +05:30
Vir (Open ERP)
32df8c07a3
[MOD] Thunderbird : Usability Improvemetns. Set search button with select all. set labels in bold and name changed. new create button added
...
bzr revid: vir@tinyerp.com-20100707065732-zevokiczsuzhmil4
2010-07-07 12:27:32 +05:30
Mantavya Gajjar
21786ff375
[FIX]: fix a small problems related to views and labels
...
bzr revid: mga@tinyerp.com-20100707062107-yljp2sv5tlpr17at
2010-07-07 11:51:07 +05:30
Mustufa Rangwala
82c108841c
[MERGE]
...
bzr revid: mra@mra-laptop-20100707055056-pdtwayt6n4qu4prf
2010-07-07 11:20:56 +05:30
Mustufa Rangwala
1622c34967
[MERGE] Merge dev3 branch for account_cancel fixed
...
bzr revid: mra@mra-laptop-20100707054857-94dx42q4xh5cspdp
2010-07-07 11:18:57 +05:30
Mustufa Rangwala
1c08a48438
[FIX] account_cancel: inhertiance view problem fixed to open journals
...
bzr revid: mra@mra-laptop-20100707054531-wquq5smji2ldrrzy
2010-07-07 11:15:31 +05:30
Mustufa Rangwala
7872ee7145
[MERGE] merge with trunk addons
...
bzr revid: mra@mra-laptop-20100707042944-x2cn3rshhq2e07ne
2010-07-07 09:59:44 +05:30
Mustufa Rangwala
58f96e72fc
[MERGE] Merge Team3 branch for account related modules cleaning and stock
...
bzr revid: mra@mra-laptop-20100707042035-v4i61w20g21xualp
2010-07-07 09:50:35 +05:30
Mustufa Rangwala
9330c385da
[MERGE] merge PAP branch for account related module clean
...
bzr revid: mra@mra-laptop-20100707041633-ya7vuevcx4ge4s27
2010-07-07 09:46:33 +05:30
Mustufa Rangwala
2c604372f7
[MERGE] merge with trunk addons
...
bzr revid: mra@mra-laptop-20100706121435-65d85ikqs1z0iaez
bzr revid: mra@mra-laptop-20100706132313-n733lghx6w75knjj
bzr revid: mra@mra-laptop-20100706135232-ibsx20ve27kkv6q1
bzr revid: mra@mra-laptop-20100707040126-qosc5js2z00wkkmm
2010-07-07 09:31:26 +05:30
Launchpad Code Hosting
e3a69a02bb
Launchpad automatic translations update.
...
bzr revid: codehost@crowberry-20100707033950-2ncjdcbn09an4b8s
2010-07-07 04:39:50 +01:00
303aa79320
[MERGE] merge with main branch
...
bzr revid: qdp-launchpad@tinyerp.com-20100706172422-bnkiuvwel9zdoj6j
2010-07-06 19:24:22 +02:00
969f90e3cb
[IMP] account: general ledger shape imrpovement
...
bzr revid: qdp-launchpad@tinyerp.com-20100706165105-l8idwq6akrv0sikd
2010-07-06 18:51:05 +02:00
2f81b78ca6
[FIX] account: general ledger printing without any filter by period
...
bzr revid: qdp-launchpad@tinyerp.com-20100706165014-j2c7by3t03u8p3o1
2010-07-06 18:50:14 +02:00
Olivier Dony
d49f2a8170
[FIX] base_action_rule: fix deadlock by ensuring parent method is called *after* end transaction - pending refactoring for this ugly thing!
...
bzr revid: odo@openerp.com-20100706160342-dzd684u172juereq
2010-07-06 18:03:42 +02:00
91bf62ce7c
[FIX] Account : When Payment is done by bank statement with a different currency, amount should be converted to company currency
...
bzr revid: jvo@tinyerp.com-20100706151022-3b3gvzht4ihpceh2
2010-07-06 20:40:22 +05:30
pap (openerp)
fffc508eb9
[IMP]:code cleaning
...
bzr revid: pap@tinyerp.co.in-20100706145803-tf7v1pukh03sdals
2010-07-06 20:28:03 +05:30
rpa (Open ERP)
8985969fba
[IMP]: base_action_rule: Improved query to get only active rules
...
bzr revid: rpa@tinyerp.com-20100706134805-pnlo2ry5fjs31sj7
2010-07-06 19:18:05 +05:30
1d9cbd3aae
[FIX] account_analytic_default, sale : currection in product_id_change method.
...
bzr revid: vra@tinyerp.com-20100706122208-2wm4opqiddzqympi
2010-07-06 17:52:08 +05:30
2dc549c3b6
[REF] account: changing name of account balance wizard files
...
bzr revid: qdp-launchpad@tinyerp.com-20100706121855-7cme6902l02bj1fl
2010-07-06 14:18:55 +02:00
d7c1d75c87
[IMP] account: more refactoring on wizards (filter on journal)
...
bzr revid: qdp-launchpad@tinyerp.com-20100706121344-slqpt2hau5tngm7s
2010-07-06 14:13:44 +02:00
Mustufa Rangwala
140211673f
[FIX]
...
bzr revid: mra@mra-laptop-20100706121143-9prw04xo5we7un1w
2010-07-06 17:41:43 +05:30
Mustufa Rangwala
b286af7d10
[REF]
...
bzr revid: mra@mra-laptop-20100706120917-gneyu73lvyrfekj0
2010-07-06 17:39:17 +05:30
Mustufa Rangwala
5fa51239ec
[REM] stock: remove unused wizard xml file
...
bzr revid: mra@mra-laptop-20100706120545-byq2jpyral1jcisu
2010-07-06 17:35:45 +05:30
Mustufa Rangwala
c47792af54
[REF]
...
bzr revid: mra@mra-laptop-20100706115632-ar3g22cjjqfo331i
2010-07-06 17:26:32 +05:30
apa
cdbf53ad8e
[IMP]:sale_crm:small changes
...
bzr revid: apa@apa-20100706115603-k1w2dz5gk3do7t6s
2010-07-06 17:26:03 +05:30
ff92140c6c
[MERGE] merge with main branch
...
[IMP] account: account balance report improved
bzr revid: qdp-launchpad@tinyerp.com-20100706115548-4jyefffxjagapu77
2010-07-06 13:55:48 +02:00
rpa (Open ERP)
0a71188f44
[REF]: base_action_rule: Code cleaning + View improvement
...
bzr revid: rpa@tinyerp.com-20100706114625-b950gbemt6kux67n
2010-07-06 17:16:25 +05:30
Mustufa Rangwala
11284af16d
[IMP] clean stock
...
bzr revid: mra@mra-laptop-20100706114451-is01gtap6mid6xkx
2010-07-06 17:14:51 +05:30
Mustufa Rangwala
9fbef5aa79
[IMP] clean stock
...
bzr revid: mra@mra-laptop-20100706112127-mhp249ctoxgg8oae
2010-07-06 16:51:27 +05:30
01a3d66e9a
[IMP] expenses
...
bzr revid: nel@tinyerp.com-20100706093459-3rr6ebih4frj1ckc
2010-07-06 11:34:59 +02:00
470916f5d6
account: account balance report improvement (not yet finished)
...
bzr revid: qdp-launchpad@tinyerp.com-20100706093231-n3zj7v8nq42aujuy
2010-07-06 11:32:31 +02:00
Mustufa Rangwala
fa6cc4cc45
[MERGE] merge with trunk addons
...
bzr revid: mra@mra-laptop-20100706092958-i1l7iwlo5wq4uddt
2010-07-06 14:59:58 +05:30
Mustufa Rangwala
7705fb3fa4
[MERGE] Merge team3 branch=>
...
[ADD] hr_payroll: added yaml, get back payroll module changes reverted by merging from addons
[REF] stock
bzr revid: mra@mra-laptop-20100706092836-vmc7dk3yco0l53xf
2010-07-06 14:58:36 +05:30
Mustufa Rangwala
75e5e93345
[MERGE] merge mtr branch for hr payroll yaml
...
bzr revid: mra@mra-laptop-20100706092311-1z3xxwlj5rfle1q6
2010-07-06 14:53:11 +05:30
mtr
eb0459c432
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20100706091037-bfhj9vjfc63le5hg
2010-07-06 14:40:37 +05:30
mtr
4d68c0c8c2
[IMP] hr_payroll:Added yaml for hr_payroll
...
bzr revid: mtr@mtr-20100706090709-hmefb20mdmxb9tb4
2010-07-06 14:37:09 +05:30
Mustufa Rangwala
cec3603d0e
[IMP] stock: Remove unused improrts
...
bzr revid: mra@mra-laptop-20100706085922-8cdbqvibguukoz2v
2010-07-06 14:29:22 +05:30
Mustufa Rangwala
41f2357e61
[MERGE] merge with trunk addons
...
bzr revid: mra@mra-laptop-20100703120259-fa0dhq8qwjmmvd8l
bzr revid: mra@mra-laptop-20100706035350-ypi0nc27m6r2bftg
bzr revid: mra@mra-laptop-20100706084601-cyyo92iyngs2nksr
2010-07-06 14:16:01 +05:30
177bd4c707
[MERGE]
...
bzr revid: nel@tinyerp.com-20100706073853-j2nnt94p0abn9y1e
2010-07-06 09:38:53 +02:00
02051df96e
[
...
bzr revid: nel@tinyerp.com-20100706072605-8srddc5av8o96w3z
2010-07-06 09:26:05 +02:00
rpa (Open ERP)
70a9cac130
[FIX]: base_calendar: Fixed problem of generator in recurrent dates
...
bzr revid: rpa@tinyerp.com-20100706054247-cjk4v6mq3auql85q
2010-07-06 11:12:47 +05:30
nel@tinyerp.com