Commit Graph

108 Commits

Author SHA1 Message Date
Vo Minh Thu abbe3ac1de [MERGE] removed a few warnings.
bzr revid: vmt@openerp.com-20121106150431-rem9us13kevan8y0
2012-11-06 16:04:31 +01:00
Launchpad Translations on behalf of openerp f3a92c9633 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121103050437-hjtar0inhj4gqyfi
2012-11-03 05:04:37 +00:00
Fabien Pinckaers 88bb090baa [MERGE] English typos
bzr revid: fp@openerp.com-20121102174200-wg7p02quakvby09j
2012-11-02 18:42:00 +01:00
Fabien Pinckaers f47bf0fd0b [MERGE] addons 16 sale
bzr revid: fp@openerp.com-20121102162611-3nt9oo1zcyzjh81l
2012-11-02 17:26:11 +01:00
Quentin (OpenERP) 173c3e4756 [FIX] sale_stock: missing field in domain
bzr revid: qdp-launchpad@openerp.com-20121102124824-y6lvasxiemcu6vm5
2012-11-02 13:48:24 +01:00
Divyesh Makwana (Open ERP) 7873e7b2d3 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121031045834-wczrlhk4ro3ag5np
bzr revid: mdi@tinyerp.com-20121101042448-1hymng6jidkfynbf
bzr revid: mdi@tinyerp.com-20121102043710-vq1f08mni1wuoj4m
2012-11-02 10:07:10 +05:30
Twinkle Christian (OpenERP) 107ef7a51b [FIX]fix tooltip
bzr revid: tch@tinyerp.com-20121031110326-r1mofl1t4ajsh4b9
2012-10-31 16:33:26 +05:30
Launchpad Translations on behalf of openerp 848cb19302 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121031044102-kzq98kd00ff26loy
2012-10-31 04:41:02 +00:00
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Twinkle Christian (OpenERP) c5c50041bc [MERGE]Merge with project branch
bzr revid: tch@tinyerp.com-20121029060747-5zecetvjcug08y03
2012-10-29 11:37:47 +05:30
Ajay Chauhan (OpenERP) 08843b9f2b [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121029053440-e0xabu6cczx0o5dt
2012-10-29 11:04:40 +05:30
Fabien Pinckaers 892c44f297 [FIX]
bzr revid: fp@openerp.com-20121028153755-thiih4im6dzaxn28
2012-10-28 16:37:55 +01:00
Launchpad Translations on behalf of openerp 93be12ab1e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026045553-t4k1bgsmirz090jr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026045641-3opz9ueu2crfb479
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026051921-6vyyfhq3fpp22atu
2012-10-26 05:19:21 +00:00
Ajay Chauhan (OpenERP) 26a0484b6f [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121025111831-22x83vr8u9lpms5v
2012-10-25 16:48:31 +05:30
Fabien Pinckaers 375d261e08 [FIX] misc fixes & useability ps week 41
bzr revid: fp@tinyerp.com-20121025083644-19mnzr6ktbpppgjg
2012-10-25 10:36:44 +02:00
Fabien Pinckaers a7368145ca [MERGE] typo
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Twinkle Christian (OpenERP) 3fa45da187 [IMP]Improve tooltip in Quatation
bzr revid: tch@tinyerp.com-20121023120415-b3eo9x5248hr6n7i
2012-10-23 17:34:15 +05:30
Turkesh Patel (Open ERP) f3682ca551 [FIX] sale_stock: improve onchange to update tax.
bzr revid: tpa@tinyerp.com-20121023071142-dz227is8kp91ivxb
2012-10-23 12:41:42 +05:30
Divyesh Makwana (Open ERP) e1e16628c3 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121023044515-lg9lw3akhcfj8yw1
2012-10-23 10:15:15 +05:30
Fabien Pinckaers cffa0d1ee4 [MERGE] misc fixes: expenses, products, crm, sale
bzr revid: fp@tinyerp.com-20121022172639-u4l0ed99wr6znjew
2012-10-22 19:26:39 +02:00
Purnendu Singh (OpenERP) fd2deaa1ce [IMP] sale_stock: improve the code
bzr revid: psi@tinyerp.com-20121022122203-4hv479pf3bbq1kwz
2012-10-22 17:52:03 +05:30
Divyesh Makwana (Open ERP) bdfe503ca7 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121016043716-w5lznx0yuv539nh8
bzr revid: mdi@tinyerp.com-20121017043900-2emt2vkpaedfgaa8
bzr revid: mdi@tinyerp.com-20121018040608-p8teop2hhjz4fqqw
bzr revid: mdi@tinyerp.com-20121019043322-qnx0uyq8q6m0u5um
bzr revid: mdi@tinyerp.com-20121022040718-bwwfz49zpqt1gwqu
2012-10-22 09:37:18 +05:30
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Jigar Amin 40e2c69f66 [MERGE] Sync with trunk
bzr revid: jam@tinyerp.com-20121017043824-pcijflp073el02ih
2012-10-17 10:08:24 +05:30
Atul Patel (OpenERP) 9b01d57864 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121016172329-23rl227ea0822ucr
2012-10-16 22:53:29 +05:30
Mayur Maheshwari (OpenERP) 8346293d72 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
Divyesh Makwana (Open ERP) 3942d75ac2 [FIX] sale_stock : Traceback when paying invoice by percentage in SO, after installing sale_stock.
bzr revid: mdi@tinyerp.com-20121015100303-cxbttr1wbdir3h8r
2012-10-15 15:33:03 +05:30
Divyesh Makwana (Open ERP) c25b2fe8ee [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121015053013-nxfzocsq58bhqzzu
2012-10-15 11:00:13 +05:30
Fabien Pinckaers 1d1879e3a4 [MERGE] better views, fix on so lines
bzr revid: fp@tinyerp.com-20121013104805-wceo6x1dpqgigsuo
2012-10-13 12:48:05 +02:00
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
pankita shah (Open ERP) 71dcfd4f35 [MERGED] merged with lp:openobject-addons
bzr revid: shp@tinyerp.com-20121012090649-oo3u11l9ompemgi7
2012-10-12 14:36:49 +05:30
Turkesh Patel (Open ERP) 96c8ffb701 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20121012055152-qyi3ev9bt0qwua44
2012-10-12 11:21:52 +05:30
pankita shah (Open ERP) 935314ea26 [IMP] move type of defaults in sale. and increase the priority of the product tree view defined in hr_epense.
bzr revid: shp@tinyerp.com-20121012051640-4i0eyltyuvpq57vc
2012-10-12 10:46:40 +05:30
Divyesh Makwana (Open ERP) 1bd7bbbd61 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121012051145-3ifnf60a19l1y63g
2012-10-12 10:41:45 +05:30
Turkesh Patel (Open ERP) 91e25d6598 [MERGE] remove account_coda and other warnings.
bzr revid: tpa@tinyerp.com-20121011130851-pl76tama6kz4t2ds
2012-10-11 18:38:51 +05:30
Divyesh Makwana (Open ERP) 20d9f75193 [FIX] sale_stock : Traceback when paying invoice by percentage in SO, after installing sale_stock.
bzr revid: mdi@tinyerp.com-20121011070128-z81rzss16d2no59i
2012-10-11 12:31:28 +05:30
Fabien Pinckaers 1257317395 [MERGE] sale
bzr revid: fp@openerp.com-20121010200032-p026szu3sys29cp0
2012-10-10 22:00:32 +02:00
pankita shah (Open ERP) 8bbd857198 [IMP] move type field in sale module and improve default state in crm_claim
bzr revid: shp@tinyerp.com-20121010113323-wpxt81u5p3hmwl6w
2012-10-10 17:03:23 +05:30
pankita shah (Open ERP) 2ac0273835 [IMP] Packaging field
bzr revid: shp@tinyerp.com-20121009114952-2jlsxqi9popw12ny
2012-10-09 17:19:52 +05:30
Amit Patel c102086030 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121009085933-caavbeibc1gauiel
2012-10-09 14:29:33 +05:30
Rajesh Prajapati (OpenERP) 72cfd07a8e [MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20121008061643-1lgckggje1deg6pj
2012-10-08 11:46:43 +05:30
Mayur Maheshwari (OpenERP) 0e947a457d [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121008055803-xod8puhl8heoc23b
2012-10-08 11:28:03 +05:30
Twinkle Christian (OpenERP) 2b909bb1b7 [MERGE]Merge with latest trunk
bzr revid: tch@tinyerp.com-20121008052212-cb5oj9eesmmv7db5
2012-10-08 10:52:12 +05:30
Mayur Maheshwari (OpenERP) d20fbedc99 [FIX]sale_stock :improve code
bzr revid: mma@tinyerp.com-20121005130308-au9bzaugkh57qclp
2012-10-05 18:33:08 +05:30
Rajesh Prajapati (OpenERP) cdff4611b0 [MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20121005120503-07e0zo8ucv8k0q3s
2012-10-05 17:35:03 +05:30
Quentin (OpenERP) 1e14590784 [FIX] sale, sale_stock, sale_analytic_plans: fixed error in yalm tests or sale_mrp if sale_analytic_plans was installed before, due to value returned for a field not present in the view (project_id). Moved back onchange_shop_id into sale module from sale_stock
bzr revid: qdp-launchpad@openerp.com-20121005091516-y7typs1hep5exd3q
2012-10-05 11:15:16 +02:00
Twinkle Christian (OpenERP) a763ece072 [FIX]ir.ui.view type field depricated
bzr revid: tch@tinyerp.com-20121005072541-v86g7zpo8yj93o4n
2012-10-05 12:55:41 +05:30
Mayur Maheshwari (OpenERP) 1d2ba2dca3 [IMP]Sale : improve flow when no product in sale order line and invoice based on delivery at the time invoice is created for that line
bzr revid: mma@tinyerp.com-20121004133241-v4tcf80gwpocbsry
2012-10-04 19:02:41 +05:30
Quentin (OpenERP) 147da38fa4 [REV] put back the label for product_uom_qty in sale order line, wrongly removed in a previous commit
bzr revid: qdp-launchpad@openerp.com-20121004090240-gckfbpgpymtcxixz
2012-10-04 11:02:40 +02:00
Quentin (OpenERP) 6d70bedd69 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121004084906-zhqfu2jz1o4hn0c1
2012-10-04 10:49:06 +02:00