Commit Graph

695 Commits

Author SHA1 Message Date
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
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
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 22ca2fd839 [MERGE] Merge the changes from main trunk branch.
bzr revid: vra@tinyerp.com-20100618052116-lbcdxkqh4cqv1xlt
2010-06-18 10:51:16 +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) 7095168648 [IMP]: Changed sequences of all main menus.
bzr revid: uco@tinyerp.com-20100617121652-5n6zb5zbk07pztn3
2010-06-17 17:46:52 +05:30
Mustufa Rangwala 18d91e942d [FIX] Purchase: calculation of amount untax was wrong (ref: mtr)
bzr revid: mra@mra-laptop-20100617071042-or2igo5wjty708fv
2010-06-17 12:40:42 +05:30
uco (OpenERP) b07b0d82b3 [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20100617050309-t7nuiyu6ns6i10qx
2010-06-17 10:33:09 +05:30
Mustufa Rangwala 32466d02a7 [MERGE]
bzr revid: mra@mra-laptop-20100617043349-f8lcffbdb4q8j4as
2010-06-17 10:03:49 +05:30
nel@tinyerp.com a11f329d20 [MERGE]
bzr revid: nel@tinyerp.com-20100616134053-xe35ztrfjy5jrsfg
2010-06-16 15:40:53 +02:00
Mustufa Rangwala a69889cb91 [MERGE]
bzr revid: mra@mra-laptop-20100616132917-468ufwdm4xzqe90e
2010-06-16 18:59:17 +05:30
nel@tinyerp.com 953e7dc67d [IMP] stock views
bzr revid: nel@tinyerp.com-20100616132609-abqesd6tm8axcokx
2010-06-16 15:26:09 +02:00
uco (OpenERP) 2a29eb4566 [MERGE]: Merged with trunk-addons
bzr revid: uco@tinyerp.com-20100616115456-xhcg3wah0vwnk01q
2010-06-16 17:24:56 +05:30
vra bf8d2a73c0 [IMP][REF] Sql-injection changes, remove print statement, some space improvement.
bzr revid: vra@tinyerp.com-20100616115139-cql5oiqf622spa6p
2010-06-16 17:21:39 +05:30
uco (OpenERP) 2bfffa9e1a [IMP] mrp, purchase, stock, hr, project: Re-organized menus.
bzr revid: uco@tinyerp.com-20100616114359-5l1fa5ht1k59wvlr
2010-06-16 17:13:59 +05:30
JMA (OpenERP) 3fcdccbeca [MERGE] Merge the changes from main trunk branch.
bzr revid: jma@tinyerp.com-20100616114211-baomq9ypqtpbv3ck
2010-06-16 17:12:11 +05:30
Vir (Open ERP) e28676b821 [MOD,IMP] point_of_sale : improvements in pos order report, account,hr,mrp,project,stock: changes in icons
bzr revid: vir@tinyerp.com-20100616114141-l6nbfgc6wsof1hzh
2010-06-16 17:11:41 +05:30
Fabien Pinckaers 5c854d68ca merge
bzr revid: fp@tinyerp.com-20100616113852-cj3dwha1w74l5q3w
2010-06-16 13:38:52 +02:00
Mustufa Rangwala 17f92c584a [REF]
bzr revid: mra@mra-laptop-20100616110807-5dxtedbzhsznrvq3
2010-06-16 16:38:07 +05:30
Mustufa Rangwala 52781d1f14 [MERGE] merge mtr branch but still need improvements on log messsages for stock, sale, purchase
bzr revid: mra@mra-laptop-20100615072015-7nazo0sdmxo1a1lm
2010-06-15 12:50:15 +05:30
mtr d3912c2789 [IMP] purchase:added log message for purchase order line
bzr revid: mtr@mtr-20100615060640-5mxmv2jzmrhypvwe
2010-06-15 11:36:40 +05:30
mtr 152ee4740d [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20100615043241-e6sm33ukdu574ghy
2010-06-15 10:02:41 +05:30
mtr 8284cc7e7d [IMP] sale,sale_journal,purchase,purchase_requisition,stock:improved log messages
bzr revid: mtr@mtr-20100615042811-q9uhngxm9b0aw3nw
2010-06-15 09:58:11 +05:30
Mustufa Rangwala 5a5b9dd3bb [MERGE] merge sbh branch for action with new name as per changes in trunk
bzr revid: mra@mra-laptop-20100614131227-znckjdoyb7wxxzjt
2010-06-14 18:42:27 +05:30
Mustufa Rangwala 394107402d Merge
bzr revid: mra@mra-laptop-20100614125638-nporp9o5wy9p7mfn
2010-06-14 18:26:38 +05:30
Vir (Open ERP) d31298b09c [ADD,IMP] board_purchase : Graph view added in purchase dashboard
bzr revid: vir@tinyerp.com-20100614120438-te1jsipj8nwkd4xz
2010-06-14 17:34:38 +05:30
sbh (Open ERP) 2f70093bf4 [Fix] purchase: Fix the action name
bzr revid: sbh@tinyerp.com-20100614115429-nlxl20rxe2wva6p5
2010-06-14 17:24:29 +05:30
sbh (Open ERP) ff81d54954 [Fix] purchase: Fix the action name
bzr revid: sbh@tinyerp.com-20100614115214-d3gdbyji7ve2uvj3
2010-06-14 17:22:14 +05:30
sbh (Open ERP) f45e7c7fa0 [Fix] Account :Fix the problem of menu
bzr revid: sbh@tinyerp.com-20100614114917-v2kl59y4p6cp9r6a
2010-06-14 17:19:17 +05:30
nel@tinyerp.com 7f6a11818c [ADD] product_manufacturer, improvement of product_electronic
bzr revid: nel@tinyerp.com-20100614112721-9g2vnueqwyycabm1
2010-06-14 13:27:21 +02:00
mtr d21c958a32 [IMP] sale,sale_journal,purchase,purchase_requisition,stock:added and modified log messages
bzr revid: mtr@mtr-20100614110951-qos5mxvtqvnhhrq0
2010-06-14 16:39:51 +05:30
JMA (OpenERP) 291f6cc29b [MERGE] Merge the changes from main trunk branch.
bzr revid: jma@tinyerp.com-20100614104704-tg3nf2v0v167m78z
2010-06-14 16:17:04 +05:30
Mustufa Rangwala e2c0ba196e [MERGE] merge with trunk
bzr revid: mra@mra-laptop-20100614044510-iffai5yviiknzqfa
2010-06-14 10:15:10 +05:30
Fabien Pinckaers d093b7df1a [IMP] bugfixes and better views
bzr revid: fp@tinyerp.com-20100613211636-qd4qub5xnpv13daa
2010-06-13 23:16:36 +02:00
nel@tinyerp.com 73d1ff3376 [IMP] remove state from line of purchase in view form
bzr revid: nel@tinyerp.com-20100613190700-c1h19ie2955qfa4r
2010-06-13 21:07:00 +02:00
Fabien Pinckaers 5239c16639 [IMP] reports on stock and purchases
bzr revid: fp@tinyerp.com-20100613155305-z4glzp5h7cq8rzw9
2010-06-13 17:53:05 +02:00
Fabien Pinckaers 1ff14e9ceb [FIX] purchase report
bzr revid: fp@tinyerp.com-20100613090134-4hs79c7709pmhltr
2010-06-13 11:01:34 +02:00
Fabien Pinckaers 3e5e33a446 [imp] remove translata=true on so and po
bzr revid: fp@tinyerp.com-20100612183216-49tgq67gzrbe51uk
2010-06-12 20:32:16 +02:00
Fabien Pinckaers 85ba0d3d1d [IMP] improve views, reviewed widget=selection
bzr revid: fp@tinyerp.com-20100612174933-pr33o0l3ho2z4dai
2010-06-12 19:49:33 +02:00
Fabien Pinckaers bb157ddf22 [IMP] better partner layout
bzr revid: fp@tinyerp.com-20100612165046-nrjx547jbbip3hha
2010-06-12 18:50:46 +02:00
Fabien Pinckaers 8baf16f25e [IMP] access rights. Remove bad stuff on point of sale
bzr revid: fp@tinyerp.com-20100612162154-f9dgju8wsmn79gq0
2010-06-12 18:21:54 +02:00
Fabien Pinckaers 71be09ecc6 [IMP] Partners Geo Assignation - new module
bzr revid: fp@tinyerp.com-20100611220209-kerfxsckm6us8yh7
2010-06-12 00:02:09 +02:00
Fabien Pinckaers 43ccf2f774 fix
bzr revid: fp@tinyerp.com-20100611142631-8njuqup1ugudbb3w
2010-06-11 16:26:31 +02:00
Mustufa Rangwala 9134be65e6 [MERGE] Merge with trunk addons
bzr revid: mra@mra-laptop-20100611040706-2ezapnahmnyyq342
2010-06-11 09:37:06 +05:30
Launchpad Code Hosting 4b613caa0e Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100611034333-kqlq67hg0dpohwry
2010-06-11 04:43:33 +01:00
nel@tinyerp.com 3102f540e5 [MERGE]
bzr revid: nel@tinyerp.com-20100610192111-ougv1pwoje0i76gw
2010-06-10 21:21:11 +02:00
nel@tinyerp.com 6829d40817 [IMP] view
bzr revid: nel@tinyerp.com-20100610191429-xgq5baej8ckiy8ju
2010-06-10 21:14:29 +02:00
nel@tinyerp.com c63d4327a7 [fix]price
bzr revid: nel@tinyerp.com-20100610191324-p2dapmlfj495gszc
2010-06-10 21:13:24 +02:00
nel@tinyerp.com 129655dbd2 [rem] comment
bzr revid: nel@tinyerp.com-20100610191207-l763z26rdluk3yi2
2010-06-10 21:12:07 +02:00
Quentin De Paoli b5215f17fd [MERGE] with trunk addons
bzr revid: qdp@cyan-20100610135930-da8fzxqg1mrl54db
2010-06-10 15:59:30 +02:00