sbh (Open ERP)
d9f9b8696f
[MERGE] : Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: sbh@tinyerp.com-20100618084307-t6qrpy82mwwhym8x
bzr revid: sbh@tinyerp.com-20100618085158-y1lgghdx8xi2eyyb
2010-06-18 14:21:58 +05:30
psi (Open ERP)
bd3226b73f
[MERGE] Merge with dev-addons3 branch
...
bzr revid: psi@tinyerp.co.in-20100618062748-q4n248ylkip9wbim
bzr revid: psi@tinyerp.co.in-20100618064323-5pxbo0m3ukhls94u
bzr revid: psi@tinyerp.co.in-20100618084546-yw7tmjxv3kt3gkvi
bzr revid: psi@tinyerp.co.in-20100618085013-lgin99tg4staqb6f
2010-06-18 14:20:13 +05:30
Mustufa Rangwala
ea0fc2f5dc
[FIX]
...
bzr revid: mra@mra-laptop-20100618084914-f6ntbt2p76953x89
2010-06-18 14:19:14 +05:30
mtr
0de4309cda
[IMP] purchase,purchase_requisition:partial changes committed as branch is required to be merged
...
bzr revid: mtr@mtr-20100618084556-os74vf7zebxrzo0w
2010-06-18 14:15:56 +05:30
Mustufa Rangwala
3be7801205
[MERGE] merge with trunk addons and remove conficts
...
bzr revid: mra@mra-laptop-20100618083859-5jbrk4u9l2vojxu6
2010-06-18 14:08:59 +05:30
Christophe Simonis
5b6099b05f
[FIX] crm_profiling: query parameter
...
bzr revid: chs@openerp.com-20100618082836-wd3ej6tobx5ukj2z
2010-06-18 10:28:36 +02:00
Mustufa Rangwala
d7e0e18d7f
[FIX] account: pay and reconcile with creation of move with good type
...
bzr revid: mra@mra-laptop-20100618082811-ky4wb3w14f8sd6iw
2010-06-18 13:58:11 +05:30
vra
e13bb3c98c
[MERGE] SQL-Injection Fixes
...
bzr revid: vra@tinyerp.com-20100618073646-edml7q843xzkq84x
2010-06-18 13:06:46 +05:30
Mustufa Rangwala
35a8398686
[IMP] creation of invoice and its payment now with in account.move with good type
...
bzr revid: mra@mra-laptop-20100618073450-9nu8eh0o9zlxxygl
2010-06-18 13:04:50 +05:30
Mustufa Rangwala
d73e5f7757
[REF]
...
bzr revid: mra@mra-laptop-20100618072359-a860w5bc6y9i56wi
2010-06-18 12:53:59 +05:30
Mustufa Rangwala
1be397c0ea
[REF]
...
bzr revid: mra@mra-laptop-20100618071912-t2pfa227jp2xcxlb
2010-06-18 12:49:12 +05:30
pap (openerp)
6be25e1411
merge
...
bzr revid: pap@tinyerp.co.in-20100618051752-hmcmnm3x0qvun6eq
bzr revid: pap@tinyerp.co.in-20100618065517-aivfz3iwzfm33fdv
bzr revid: pap@tinyerp.co.in-20100618071807-xseqfzsntzw898sf
2010-06-18 12:48:07 +05:30
sbh (Open ERP)
3a76c0baaf
[Fix] stock: Check the field is exist then qty_available display in report
...
bzr revid: sbh@tinyerp.com-20100618071206-poxwm1ovzdk6s083
2010-06-18 12:42:06 +05:30
2af260f978
[REVERT]:Integration script,Makefile changes need to create diff repository as it is affecting test.openobject.com:8010
...
bzr revid: nch@tinyerp.com-20100618071204-44ftuhvtun3yerzt
2010-06-18 12:42:04 +05:30
sbh (Open ERP)
3e7f590e31
[Fix] stock: Remove the duplicate action for report and put error if move line is not create
...
bzr revid: sbh@tinyerp.com-20100618070339-q14dg8p56w02p394
2010-06-18 12:33:39 +05:30
vra
fd1578daec
[MERGE] merge the changes from trunk main branch.
...
bzr revid: vra@tinyerp.com-20100618065505-qwivms0atr8ld3zr
2010-06-18 12:25:05 +05:30
sbh (Open ERP)
bbb8574000
[Fix] Stock: Fix the name of picking action
...
bzr revid: sbh@tinyerp.com-20100618064626-7oh625i6bj1f454i
2010-06-18 12:16:26 +05:30
Mustufa Rangwala
da9b711d75
[FIX] conflicts solve for menu account strutur
...
bzr revid: mra@mra-laptop-20100618064043-9gnokcgtre9lu89c
2010-06-18 12:10:43 +05:30
psi (Open ERP)
360afadc80
[IMP] account: Improve the wizard view, accunt_analytic_plan:Improve form view
...
bzr revid: psi@tinyerp.co.in-20100618062520-b0ry32hrod0cmtsr
2010-06-18 11:55:20 +05:30
sbh (Open ERP)
d07e439331
[Fix] Stock: Fix the problem of key error orgin for outgoing picking
...
bzr revid: sbh@tinyerp.com-20100618062439-91tah2gr61jqgdvq
2010-06-18 11:54:39 +05:30
Mustufa Rangwala
68f8c1d573
[MERGE]
...
bzr revid: mra@mra-laptop-20100618043703-1f7cn3iilchx7vxa
bzr revid: mra@mra-laptop-20100618062143-vkgjue5qzdimp96z
2010-06-18 11:51:43 +05:30
vra
2cb7e09f47
[REF] ref.
...
bzr revid: vra@tinyerp.com-20100618060559-wslsjxa4t4aw97vz
2010-06-18 11:35:59 +05:30
bffad7400e
[MOD] Changes in main menu sequence, Reoraganization of Tools menu
...
bzr revid: vir@tinyerp.com-20100618060400-1alih9oe4ewwhmwz
2010-06-18 11:34:00 +05:30
e23f44c42d
[MOD] Small change in menu sequence
...
bzr revid: vir@tinyerp.com-20100618055858-s1ilio4v2zxwl6cl
2010-06-18 11:28:58 +05:30
mtr
ed74d897dd
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20100618055549-peueqkwyp3mdxmqp
2010-06-18 11:25:49 +05:30
sbh (Open ERP)
135e85fb83
[MERGE] : Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: sbh@tinyerp.com-20100618053109-qc8qenijutozjcn3
2010-06-18 11:01:09 +05:30
psi (Open ERP)
12e2a87595
[MERGE] Merge with dev-addons3 branch
...
bzr revid: psi@tinyerp.co.in-20100618052733-kfuqzqr3jq0nj2uq
2010-06-18 10:57:33 +05:30
Vir (Open ERP)
cb628bae50
[MERGE] Merge with Trunk Addons
...
bzr revid: vir@tinyerp.com-20100618052158-why0uz9oiltw8h1h
2010-06-18 10:51:58 +05:30
vra
22ca2fd839
[MERGE] Merge the changes from main trunk branch.
...
bzr revid: vra@tinyerp.com-20100618052116-lbcdxkqh4cqv1xlt
2010-06-18 10:51:16 +05:30
rpa (Open ERP)
3678e74f3f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20100617052120-0o23k9z3r28g5pkc
bzr revid: rpa@tinyerp.com-20100618050156-fhpx2xa8bhrj0w3n
2010-06-18 10:31:56 +05:30
uco (OpenERP)
993c3fa1d2
[MERGE]: Merged with trunk-server
...
bzr revid: uco@tinyerp.com-20100618043543-vy1f34tly0lwrz14
2010-06-18 10:05:43 +05:30
uco (OpenERP)
0ebc579832
[MERGE]: Merged with trunk-addons
...
bzr revid: uco@tinyerp.com-20100618043247-89skoxkyj967xuv3
2010-06-18 10:02:47 +05:30
Launchpad Code Hosting
b8bc3af4d8
Launchpad automatic translations update.
...
bzr revid: codehost@crowberry-20100618033308-7p6kb07l11bx3hgc
2010-06-18 04:33:08 +01:00
Launchpad Code Hosting
19c3027ac5
Launchpad automatic translations update.
...
bzr revid: codehost@crowberry-20100618033234-85ymlh6ucg7eynam
2010-06-18 04:32:34 +01:00
Mantavya Gajjar
f789e02e82
[IMP]: enable holiday calculation with payslip
...
bzr revid: mga@tinyerp.com-20100618031140-eqg2negwaggok5tf
2010-06-18 08:41:40 +05:30
Mantavya Gajjar
fc7529f3e6
[IMP]: improvements to payroll module
...
bzr revid: mga@tinyerp.com-20100618005141-bh618yzj9ucz1jt5
2010-06-18 06:21:41 +05:30
uco (OpenERP)
2b7a322470
[IMP]: Re-organized Tools menu structure.
...
bzr revid: uco@tinyerp.com-20100617134420-52257h3u0w6y7iux
2010-06-17 19:14:20 +05:30
Mustufa Rangwala
99f39da4aa
[IMP] account: menu strcuture changes (ref: pap)
...
bzr revid: mra@mra-laptop-20100617132201-1fqjju5vlar0qo92
2010-06-17 18:52:01 +05:30
pap (openerp)
c8a0a2a191
[IMP]:
...
1) added missing wizards under Financial Management/Periodical Processing
2) added entry_type on move line for different types of invoices
bzr revid: pap@tinyerp.co.in-20100617131758-668hhpu1q1qkmt20
2010-06-17 18:47:58 +05:30
Mustufa Rangwala
ec23bbbe73
[MERGE]
...
bzr revid: mra@mra-laptop-20100617071519-u4kb74yay8v55q08
bzr revid: mra@mra-laptop-20100617103236-ac03zl97wcvuu7bu
bzr revid: mra@mra-laptop-20100617131201-lorh9maj58oagbnh
2010-06-17 18:42:01 +05:30
uco (OpenERP)
a8eeaade48
[REF]: Changed sequence of Administration menu.
...
bzr revid: uco@tinyerp.com-20100617121804-8hur2x0ftaxurr8j
2010-06-17 17:48:04 +05:30
uco (OpenERP)
7095168648
[IMP]: Changed sequences of all main menus.
...
bzr revid: uco@tinyerp.com-20100617121652-5n6zb5zbk07pztn3
2010-06-17 17:46:52 +05:30
e4de4fc6ac
[MERGE]
...
bzr revid: nel@tinyerp.com-20100617114318-ozi57u9u55fcjh38
2010-06-17 13:43:18 +02:00
6fd4f9e65d
[IMP] stock views
...
bzr revid: nel@tinyerp.com-20100617114224-fdegrmygwfefxcpg
2010-06-17 13:42:24 +02:00
c6d2401fd6
[MOD] Small changes in menus
...
bzr revid: vir@tinyerp.com-20100617103955-fqzfqh0ezllo9c1f
2010-06-17 16:09:55 +05:30
efc1897706
[MOD] bank,country,crm and partner view : modification in menu sequence
...
bzr revid: vir@tinyerp.com-20100617103606-f3fans7y2e7qrcba
2010-06-17 16:06:06 +05:30
uco (OpenERP)
944d3403ee
[IMP]: Menu Re-organization.
...
bzr revid: uco@tinyerp.com-20100617100547-zwn0ri6cm8ggkycp
2010-06-17 15:35:47 +05:30
uco (OpenERP)
42443c892d
[IMP] crm, hr, project, stock, sale: Menu Re-organization.
...
bzr revid: uco@tinyerp.com-20100617100451-75hoxnbpjoo1clie
2010-06-17 15:34:51 +05:30
8c1ef52f07
[IMP] stock split into add condition qty <=0
...
bzr revid: nel@tinyerp.com-20100617095552-teeaeyd2yuwb46y0
2010-06-17 11:55:52 +02:00
Jay (Open ERP)
7e36ede9ba
[FIX] Tools : Safe_eval should support make_function and map.
...
lp bug: https://launchpad.net/bugs/595275 fixed
bzr revid: jvo@tinyerp.com-20100617093845-qgwrma8khcgv8f5h
2010-06-17 15:08:45 +05:30
sbh (Open ERP)