Commit Graph

83 Commits

Author SHA1 Message Date
Quentin (OpenERP) 66c3093fee [IMP] contract management: misc improvements
bzr revid: qdp-launchpad@openerp.com-20120615081254-rhh9nwmz3bqn7e9d
2012-06-15 10:12:54 +02:00
Amit Patel (OpenERP) 3fbff8ae21 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120615063749-jlux8i64e6lgu8j5
2012-06-15 12:07:49 +05:30
Amit Patel (OpenERP) eb5a048493 [MERGE/IMP]:merged sgo's branch for view improvements.
bzr revid: apa@tinyerp.com-20120614123738-5bxxfndd424imm7e
2012-06-14 18:07:38 +05:30
Sanjay Gohel (Open ERP) 787e2c7e01 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120614101024-ppna6h442m50f3no
bzr revid: sgo@tinyerp.com-20120614104534-25j88fdzquc5qdrg
2012-06-14 16:15:34 +05:30
Sanjay Gohel (Open ERP) 56ffb32517 [IMP]:contract,analytic_project,analytic_hr_expense: improve whole contract view use group instead of table and improve view
bzr revid: sgo@tinyerp.com-20120614100753-giewe8jay1xx04wb
2012-06-14 15:37:53 +05:30
Stephane Wirtel b846d5fec2 [FIX] account_analytic_analysis: we can't create a view of an external module
bzr revid: stw@openerp.com-20120614100123-eq8wpp3t20minf59
2012-06-14 12:01:23 +02:00
Quentin (OpenERP) 0fd300caf4 [IMP] account_analytic_analysis: the 'remaining hours to invoice' is different than the 'remaining hours to work'
bzr revid: qdp-launchpad@openerp.com-20120613090525-o5r4b84dfz5r2h6e
2012-06-13 11:05:25 +02:00
Sanjay Gohel (Open ERP) 2c1d31f4e5 [IMP]improve view in contract
bzr revid: sgo@tinyerp.com-20120612130056-vjryu1lo5l9v5cq4
2012-06-12 18:30:56 +05:30
Amit Patel (OpenERP) 0400ae4047 [IMP]:pass the context parameter in onchange
bzr revid: apa@tinyerp.com-20120612093020-019ycc7wmn03gczz
2012-06-12 15:00:20 +05:30
Amit Patel (OpenERP) d30d000ae3 [IMP]:added icons on buttons.
bzr revid: apa@tinyerp.com-20120608072054-lrcr5jhnpg9jgyil
2012-06-08 12:50:54 +05:30
Quentin (OpenERP) c23de40df6 [ADD] analytic_contract_hr_expense: split of features of account_analytic_analysis and creation of a new module to contain all the stuff related to hr_expense (in order to keep clean dependancies)
bzr revid: qdp-launchpad@openerp.com-20120607123641-kjzynx1wwi4282lu
2012-06-07 14:36:41 +02:00
Amit Patel (OpenERP) 4457f2618a [ADD]:added new module analytic_contract_project.
bzr revid: apa@tinyerp.com-20120607124201-bjmupfhjfecr8h90
2012-06-07 18:12:01 +05:30
Amit Patel (OpenERP) 15b9557943 [IMP]:improved contract view in project module
bzr revid: apa@tinyerp.com-20120607102351-8mqh6e93ecjqxb8f
2012-06-07 15:53:51 +05:30
Quentin (OpenERP) 8f4cb2dfc9 [IMP] analytic: usability changes in contract form view
bzr revid: qdp-launchpad@openerp.com-20120607092405-gwqzw9s71nb90r0b
2012-06-07 11:24:05 +02:00
Amit Patel (OpenERP) 1fbf26f48f [IMP]:improved contract data tab in project
bzr revid: apa@tinyerp.com-20120607073928-hrstvq39z1hsqex2
2012-06-07 13:09:28 +05:30
Amit Patel (OpenERP) 26231a214a [IMP]:border=0
bzr revid: apa@tinyerp.com-20120607072911-tjv04tlssk1nbsu1
2012-06-07 12:59:11 +05:30
Amit Patel (OpenERP) 263f03336b [IMP]:improved css
bzr revid: apa@tinyerp.com-20120607072822-o8yf42zh883t5pu7
2012-06-07 12:58:22 +05:30
Amit Patel (OpenERP) 48ce06b78c [IMP]:border=0
bzr revid: apa@tinyerp.com-20120607071509-xgh4ngj5mhlfkubq
2012-06-07 12:45:09 +05:30
Amit Patel (OpenERP) 9d7e448771 [IMP]:improved view and css for contract view
bzr revid: apa@tinyerp.com-20120607065350-gopdsnwdo1jmsccz
2012-06-07 12:23:50 +05:30
Quentin (OpenERP) 0125e320c9 [IMP] analytic: misc imp related to project and contract mangement task
bzr revid: qdp-launchpad@openerp.com-20120606153629-jlk1k0ze09b7pu6s
2012-06-06 17:36:29 +02:00
Sanjay Gohel (Open ERP) 48cf6955a7 [IMP]improve view and add field in hr_timesheet_invoice
bzr revid: sgo@tinyerp.com-20120606070651-ol42dl8d6o5lqlsl
2012-06-06 12:36:51 +05:30
Amit Patel (OpenERP) f5c7e060b8 [IMP]:improved view code
bzr revid: apa@tinyerp.com-20120604105129-zlbaoej3qj4kdpbo
2012-06-04 16:21:29 +05:30
Sanjay Gohel (Open ERP) 4a864e1ff1 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120604103823-oncbbg2b2hswp002
2012-06-04 16:08:23 +05:30
Sanjay Gohel (Open ERP) e7f5c1088b [IMP]type invible when type is contract and template and project related issues solved
bzr revid: sgo@tinyerp.com-20120604103342-g0pnstp5cexttdb7
2012-06-04 16:03:42 +05:30
Amit Patel (OpenERP) 6c6326cdab [MERGE/IMP]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-follower-dbr
bzr revid: apa@tinyerp.com-20120604093905-flfm36syrqva9zfc
2012-06-04 15:09:05 +05:30
Sanjay Gohel (Open ERP) 26a574f796 [IMP]change report and made changes in timesheet which is not shown contract record and attrs on the field
bzr revid: sgo@tinyerp.com-20120604071856-xibj1lz9rjclyzmq
2012-06-04 12:48:56 +05:30
Amit Patel (OpenERP) f1bdc8faff [MERGE]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-view-imp-dbr
bzr revid: apa@tinyerp.com-20120531100727-cjcog77k58gbhcf6
2012-05-31 15:37:27 +05:30
DBR (OpenERP) 3d87080c54 [Merge]with : parent project branch
bzr revid: dbr@tinyerp.com-20120531093747-zdlabh6wf8qncjrm
2012-05-31 15:07:47 +05:30
DBR (OpenERP) 498549e8e5 [IMP]account_analytic_analysis: Inherit project form view
bzr revid: dbr@tinyerp.com-20120531093323-wks6p7arbyoam8t9
2012-05-31 15:03:23 +05:30
Sanjay Gohel (Open ERP) 929cf6d2a6 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120531073324-y93wiwdrxsq7bhm7
2012-05-31 13:03:24 +05:30
Sanjay Gohel (Open ERP) 2da36cab75 [IMP]create function for open hr_expense for current analytic_id in hr_expense line and improve code
bzr revid: sgo@tinyerp.com-20120531072758-fhaake1kjj13iiwi
2012-05-31 12:57:58 +05:30
Amit Patel (OpenERP) 5bc6820c17 [IMP]:account_analytic_analysis:improved view for contract.
bzr revid: apa@tinyerp.com-20120531050942-e7y914pmzuq7qlwm
2012-05-31 10:39:42 +05:30
Amit Patel (OpenERP) ee1b8f1342 [IMP]:renamed fieldslable
bzr revid: apa@tinyerp.com-20120530133436-wihrnh13wr12s4m8
2012-05-30 19:04:36 +05:30
Sanjay Gohel (Open ERP) b02a3684d0 [MERGE]merge with parent branch and resolve conflicts
bzr revid: sgo@tinyerp.com-20120530130522-f8d6vem8wwlp0z4r
2012-05-30 18:35:22 +05:30
Sanjay Gohel (Open ERP) 11bf57f1bf [IMP]add expense line and add depend expense of hr in contract for calculation
bzr revid: sgo@tinyerp.com-20120530125641-w27mjp97b981yrpd
2012-05-30 18:26:41 +05:30
Amit Patel (OpenERP) eddbed0f58 [IMP]:improved css for contract view
bzr revid: apa@tinyerp.com-20120530124535-d3it3v890juhjkof
2012-05-30 18:15:35 +05:30
Amit Patel (OpenERP) 63708de91a [IMP]:improved analytic view
bzr revid: apa@tinyerp.com-20120530113122-jcngf2112sjq31nb
2012-05-30 17:01:22 +05:30
Sanjay Gohel (Open ERP) e886a135ed [IMP/MERGE]improve code and merge with latest parent branch
bzr revid: sgo@tinyerp.com-20120529104150-a7q7s1v48949cupe
bzr revid: sgo@tinyerp.com-20120529112009-lh2kom166hwkl12w
2012-05-29 16:50:09 +05:30
Amit Patel (OpenERP) cbb75342c0 [IMP]:improved view and code.
bzr revid: apa@tinyerp.com-20120529104451-24axuiq8m5s43tcj
2012-05-29 16:14:51 +05:30
Sanjay Gohel (Open ERP) 3bdb46d113 [IMP]remaining added and view improvement
bzr revid: sgo@tinyerp.com-20120529103949-wm8ln19qzwjar9yn
2012-05-29 16:09:49 +05:30
Sanjay Gohel (Open ERP) 6993932c06 [IMP]add total line for lines total
bzr revid: sgo@tinyerp.com-20120529083145-2iw8liantsejqs0x
2012-05-29 14:01:45 +05:30
Sanjay Gohel (Open ERP) 219f9283b0 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120529081756-l1bkznybq8ulajxc
2012-05-29 13:47:56 +05:30
Sanjay Gohel (Open ERP) d29971eb7e [IMP]create view for contract lines and add field which needed
bzr revid: sgo@tinyerp.com-20120529065713-bokhp0ng21muadvo
2012-05-29 12:27:13 +05:30
Amit Patel (OpenERP) cc38db164d [IMP]:improved view for contract
bzr revid: apa@tinyerp.com-20120529054621-7eaa6o1meg8xwvk1
2012-05-29 11:16:21 +05:30
Sanjay Gohel (Open ERP) 70bee15881 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120529050253-914jkrtgig53pxz0
2012-05-29 10:32:53 +05:30
Sanjay Gohel (Open ERP) a39b8f3b70 [IMP]boolean timesheet move to hr_timesheet from invoice and view improve
bzr revid: sgo@tinyerp.com-20120528133158-n7cp580jl8kpru9y
2012-05-28 19:01:58 +05:30
Amit Patel (OpenERP) 5bb11f925b [IMP]:improved view.
bzr revid: apa@tinyerp.com-20120528132313-yg16pxo8xfbzmgbe
2012-05-28 18:53:13 +05:30
Sanjay Gohel (Open ERP) 911f71dd85 [MERGE]merge and remove conflicts
bzr revid: sgo@tinyerp.com-20120528130727-d2czzzkspgwib2vd
2012-05-28 18:37:27 +05:30
Sanjay Gohel (Open ERP) 0e90703ad0 [IMP]add boolean of project,projec_longterm,and project issue and create related project
bzr revid: sgo@tinyerp.com-20120528123054-ntp1u33q1iavwtej
2012-05-28 18:00:54 +05:30
Amit Patel (OpenERP) aeb03d8c4c [MERGE]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-field-improvement-sgo
bzr revid: apa@tinyerp.com-20120528105417-wwigq0f71smwjtsp
2012-05-28 16:24:17 +05:30