Commit Graph
14835 Commits
Author SHA1 Message Date
Mustufa Rangwala f08424d171 [MERGE] merge psi branch for hr holidsays demo data and hr recuriement small changes
bzr revid: mra@mra-laptop-20100610104719-lbthrmpyl7wdwde3
2010-06-10 16:17:19 +05:30
psi (Open ERP) 5bf5f81b7a [MERGE] merge with dev addons3 branch
bzr revid: psi@tinyerp.co.in-20100610094230-fs2zdfmy7m7ffsej
2010-06-10 15:12:30 +05:30
Harry (OpenERP) df9acf386a [MERGE]
bzr revid: hmo@tinyerp.com-20100610094052-w1c0gzswgkjvp108
2010-06-10 15:10:52 +05:30
psi (Open ERP) 2a6a0af029 [IMP] hr_hoidays:Change is demo data, hr_recruitment: add a new field of type char
bzr revid: psi@tinyerp.co.in-20100610093638-n5bj4ptgicyd49ct
2010-06-10 15:06:38 +05:30
noz d29cc52980 [FIX] Fixed logging of picking on creation.
bzr revid: noz@tinyerp.com-20100610093215-rvlukbhmquxxft5g
2010-06-10 15:02:15 +05:30
Mustufa Rangwala c9e2f6a493 [MERGE] atp branch for yaml hr modules (has some problems will be solved)
bzr revid: mra@mra-laptop-20100610092802-bgs4ula327mt6ydc
2010-06-10 14:58:02 +05:30
ksa (Open ERP) a4f7efe9df [IMP] Improvement for osv related problem
bzr revid: ksa@tinyerp.co.in-20100610092325-x1sqepg6ve7qkxbk
2010-06-10 14:53:25 +05:30
nel@tinyerp.com 96bfb5b2df [IMP] use exist global and change setting production lots
bzr revid: nel@tinyerp.com-20100610085912-qesib9robxe4adc6
2010-06-10 10:59:12 +02:00
Mustufa Rangwala b986ab355c [MEREG] Merge mtr branch for account joural changes and other changes
[IMP] improve

bzr revid: mra@mra-laptop-20100610085303-r8fx0b9vlakrd1oq
2010-06-10 14:23:03 +05:30
Mustufa Rangwala 9e76c69a67 [MERGE]
bzr revid: mra@mra-laptop-20100610080424-2zx2r8t508czrms3
2010-06-10 13:34:24 +05:30
Fabien Pinckaers 6dd17f672d [IMP] Marketing campaigns
bzr revid: fp@tinyerp.com-20100610080254-mryfirtlfy5chj0s
2010-06-10 10:02:54 +02:00
Mustufa Rangwala 799359de0d [MERGE] merge psi branch for hr_recuritement
bzr revid: mra@mra-laptop-20100610070914-7nrxvf7t5hxbijdw
2010-06-10 12:39:14 +05:30
rpa (Open ERP) 15da9ad664 [IMP]: base_contact: Improvement for dropping trigger and functions
bzr revid: rpa@tinyerp.com-20100610065314-jjik5f5cdtyyk125
2010-06-10 12:23:14 +05:30
nel@tinyerp.com 10e3e39e76 [IMP] change file name and add stock as dependency
bzr revid: nel@tinyerp.com-20100610064130-fz0jgik8tuhmhy56
2010-06-10 08:41:30 +02:00
mtr fec3faf818 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20100610054619-x4v0s3d6tgfxpjed
2010-06-10 11:16:19 +05:30
ksa (Open ERP) 7a3792bb43 [MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: ksa@tinyerp.co.in-20100610053641-dmdr8myub2at83di
2010-06-10 11:06:41 +05:30
mtr a401c41180 [IMP] account,account_cancel:removed the field 'Allow Cancelling Entries' only from the view
bzr revid: mtr@mtr-20100610053551-35ipuzl82v2ra9is
2010-06-10 11:05:51 +05:30
ksa (Open ERP) 9c9b8d7ff7 [MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: ksa@tinyerp.co.in-20100610052305-ieirg4gbmd478md1
2010-06-10 10:53:05 +05:30
rpa (Open ERP) bfd54698f6 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: rpa@tinyerp.com-20100610051429-qhr774didyxtvsvn
2010-06-10 10:44:29 +05:30
rpa (Open ERP) a050bbf415 [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20100610051021-hngq8r5cz1l752g5
2010-06-10 10:40:21 +05:30
psi (Open ERP) 5a29388d0e [IMP] hr_recruitment: Improve applicant form view, correct stages for applicant
bzr revid: psi@tinyerp.co.in-20100610043803-f1m5c0z9d29rsqig
2010-06-10 10:08:03 +05:30
uco (OpenERP) 3afbddb123 [MERGE]: Merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: uco@tinyerp.com-20100610043617-agka577pzdmvaelf
2010-06-10 10:06:17 +05:30
Mustufa Rangwala 235cc31796 [MERGE] merge psi branch for yaml account_tax_include
bzr revid: mra@mra-laptop-20100610042056-2rxt847jrijxbto8
2010-06-10 09:50:56 +05:30
Mustufa Rangwala 4b4d9135ca [MERGE]
bzr revid: mra@mra-laptop-20100610041504-2xmhoxs97yallg3y
2010-06-10 09:45:04 +05:30
Mustufa Rangwala 70776b0c8f [MERGE] Merge sbh brancg for changes of product_margin, sale_marign merge, product_visible_discount, account_invoice_salesman
bzr revid: mra@mra-laptop-20100610041130-70m3cg90i1xkehoy
2010-06-10 09:41:30 +05:30
Launchpad Code Hosting ffdb153046 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100610033635-y5w7rrhl87hk4dbk
2010-06-10 04:36:35 +01:00
Harry (OpenERP) 8900030474 [IMP]sale_crm: convert make sale order winzard into osv_memory
bzr revid: hmo@tinyerp.com-20100609153030-mhp8hzp9f0ennmuv
2010-06-09 21:00:30 +05:30
atp (OpenERP) ff1681b22f [IMP] membership: report, yml
bzr revid: hmo@tinyerp.com-20100609151036-9ynxz71j28y71yb9
2010-06-09 20:40:36 +05:30
nel@tinyerp.com ae98eb8228 [IMP] add default values for partner
bzr revid: nel@tinyerp.com-20100609151024-s2gdt4pl35zfk7d6
2010-06-09 17:10:24 +02:00
atp (OpenERP) ccd09bcef3 [IMP] membership: improvment
bzr revid: hmo@tinyerp.com-20100609150054-8wqicowhoczpp5d0
2010-06-09 20:30:54 +05:30
Mantavya Gajjar 7aa49e723d [MERGE]: merging from the same branch
bzr revid: mga@tinyerp.com-20100609145705-ofz0qqb3jj8ini2i
2010-06-09 20:27:05 +05:30
Mantavya Gajjar c3f32862d1 [IMP]: implement view for new object company contrinute
bzr revid: mga@tinyerp.com-20100609145448-o6pgy1huodq6c5mm
2010-06-09 20:24:48 +05:30
Mantavya Gajjar 3f3b015306 [IMP]: improvement in payroll, seprate objects for the heads ad company contribution
bzr revid: mga@tinyerp.com-20100609143822-4sv2r1skek77t8mw
2010-06-09 20:08:22 +05:30
Mantavya Gajjar 573acb3614 [REM]: convert TAB to space
bzr revid: mga@tinyerp.com-20100609143753-7wkadpsshmbwgtln
2010-06-09 20:07:53 +05:30
psi (Open ERP) afd7efa931 [ADD] account_tax_include: YML test
bzr revid: psi@tinyerp.co.in-20100609140110-tbrfbzcb93qv04t4
2010-06-09 19:31:10 +05:30
atp (OpenERP) 29b06ee78a [IMP] event: improvement
bzr revid: hmo@tinyerp.com-20100609135821-61rfaf9lnqit5aez
2010-06-09 19:28:21 +05:30
nel@tinyerp.com 79a6544854 [ADD] create claim from delivery
bzr revid: nel@tinyerp.com-20100609135334-t4yx5y293gqgv2x9
2010-06-09 15:53:34 +02:00
rpa (Open ERP) 1b4d31046d [IMP]: mail_gateway: * Put reference_id for message reference
* Referenced thread_id for mailgate.message object

bzr revid: rpa@tinyerp.com-20100609133755-4jlx6hlmt5d9xsyb
2010-06-09 19:07:55 +05:30
Mustufa Rangwala b54cc4ea34 [MERGE] merge with trunk
bzr revid: mra@mra-laptop-20100609132646-j7krm6i1ikrrz2rn
2010-06-09 18:56:46 +05:30
uco (OpenERP) b437689319 [FIX] purchase: Corrected the passing of wrong partner_id in purchase order from procurements.
bzr revid: uco@tinyerp.com-20100609132415-ij6m4wqhl3w8ncpr
2010-06-09 18:54:15 +05:30
Mustufa Rangwala 9148775b6e [MERGE] merge mtr branch for changes of multicompany environement with account move lines
[IMP] optimize the code

bzr revid: mra@mra-laptop-20100609132253-giau5tgcdlcoh6aq
2010-06-09 18:52:53 +05:30
ksa (Open ERP) 7b98c7a4c1 [IMP] Get New Value for action in audittrial
bzr revid: ksa@tinyerp.co.in-20100609130859-4wpkabs0dqw0yecw
2010-06-09 18:38:59 +05:30
rpa (Open ERP) b2b048737d [IMP]: fetchmail: * If the model for which mails to be fetched do not have message_new, we should use basic create method.
* Improved history maintenance (Put proper data + attachment in history)

bzr revid: rpa@tinyerp.com-20100609124006-84whz7b92fgnmr7e
2010-06-09 18:10:06 +05:30
uco (OpenERP) 3aa3a122f4 [MERGE]: Merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: uco@tinyerp.com-20100609122033-if3lo4c04n0wxmt7
2010-06-09 17:50:33 +05:30
uco (OpenERP) d30a81d6fb [IMP] sale: Improved yaml for procurement.
bzr revid: uco@tinyerp.com-20100609121859-oz61e713gcdqtw2z
2010-06-09 17:48:59 +05:30
Harry (OpenERP) 118d5545bf [IMP] mail_gateway: improve view
bzr revid: hmo@tinyerp.com-20100609121121-0q2ma69ux81jrtsq
2010-06-09 17:41:21 +05:30
rpa (Open ERP) e02afffe61 [IMP]: fetchmail: Fetchmail should depend on mail_gateway and should not use separate object for history as its achieved by mailgate.message
bzr revid: rpa@tinyerp.com-20100609115439-pzh4iquokb64fk2k
2010-06-09 17:24:39 +05:30
Mustufa Rangwala 977e3f7b13 [MERGE] merge pap branch for uk charts account with report_type field added
bzr revid: mra@mra-laptop-20100609114946-f80wyzl0nlk9ip0i
2010-06-09 17:19:46 +05:30
uco (OpenERP) cc1d0ded2c [MERGE] Merged with uco-dev-addons1:
Following are the changes:
Task 819: mrp_procurement->procurement
Task 808: To add doc string to MRP & related modules
Task 813: To add doc string to stock and related modules with wizards
Task 909: multilevel bom: * Put multi_level_bom = True on demo data for product appearing into Manufacturing/Master Data/Master Bill of Materials. * Put domain = [('multi_level_bom','=',True)] on menu Manufacturing/Master Data/Master Bill of Materials
Task 290: Write YAML scenario for mrp and mrp related modules.

bzr revid: uco@tinyerp.com-20100609114330-pcupocwrfocbyop2
2010-06-09 17:13:30 +05:30
Vir (Open ERP) 30e2cb4f5a [MOD,IMP] membership : Usability Improvements
bzr revid: vir@tinyerp.com-20100609113106-3uhdskz8w6wetk7q
2010-06-09 17:01:06 +05:30