Denis Ledoux
a99b5786d1
[MERGE] Forward-port of 7.0 bugfixes up to rev. 9337 (dle@openerp.com-20130731153129-8hmqrgsg3e9d533f)
...
bzr revid: mat@openerp.com-20130726073123-6buqe3rg321gj5rw
bzr revid: odo@openerp.com-20130730110536-a74ea14pwb2y03ay
bzr revid: dle@openerp.com-20130801123703-frjhpeqwocsjo7ge
2013-08-01 14:37:03 +02:00
Martin Trigaux
81dd0b77f0
[FIX] hr_timesheet_invoice: better invoice price management
...
- if force product, use its sale price
- if on a journal of type 'general' (eg: expenses) and has a product, use its sale price
- else (eg: expenses) use the total amount on analytic lines
bzr revid: mat@openerp.com-20130725100402-gk201bqvwo2g9137
2013-07-25 12:04:02 +02:00
Martin Trigaux
6365f69b4d
[FIX] hr_timesheet_invoice: use product price on invoice even when not forcing
...
bzr revid: mat@openerp.com-20130724115907-i61nvau0d5jd5jrc
2013-07-24 13:59:07 +02:00
Christophe Simonis
bf29a2ebc7
[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
...
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Martin Trigaux
b3bba607e6
allow using price of 0 or less for expense
...
bzr revid: mat@openerp.com-20130621124737-zo01u5jbafnb0ges
2013-06-21 14:47:37 +02:00
Martin Trigaux
9caf5ef64c
[FIX] hr_timehseet_invoice: allow use force product
...
bzr revid: mat@openerp.com-20130621122639-sfcb7q1pwquiz46l
2013-06-21 14:26:39 +02:00
Christophe Simonis
6a9adbca62
[MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
...
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Pinakin Nayi (OpenERP)
490a86d21b
[IMP]hr_timesheet_invoice : product is not mandatory at the time of creation invoice of expenses and in invoice set product price on the basic of analytic line not on the basis of product price
...
bzr revid: pna@tinyerp.com-20130612084504-dmgz3t3vlyruooje
2013-06-12 14:15:04 +05:30
Christophe Matthieu
9d9e3d2ef8
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02:00
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Fabien Pinckaers
bed8a96291
[FIX] misc contracts fixes, timesheets
...
bzr revid: fp@openerp.com-20130312121218-vsvmaj12px4vqpvz
2013-03-12 13:12:18 +01:00
Foram Katharotiya (OpenERP)
39d3d6aa77
[IMP] set pricelist as a default
...
bzr revid: fka@tinyerp.com-20130307063531-6pnq7lictibbnybe
2013-03-07 12:05:31 +05:30
Foram Katharotiya (OpenERP)
ddb5904d6f
[IMP] set default value of timesheet invoice ratio
...
bzr revid: fka@tinyerp.com-20130305065232-s5tjce9dj394yku4
2013-03-05 12:22:32 +05:30
Olivier Dony
49597f0e66
[MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
...
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +01:00
Fabien Pinckaers
c7d709e579
[FIX] misc fixes on contracts, timesheets
...
bzr revid: fp@openerp.com-20130312123321-mly0k9lrh3im78bg
2013-03-12 13:33:21 +01:00
Thibault Delavallée
d53a63d563
[IMP] Analytic, hr_timesheet_invoice: moved chatter and subtypes for analytic into analytic; removed salesteam-related subtypes.
...
bzr revid: tde@openerp.com-20121219173127-xcz1j92p46sn6qu3
2012-12-19 18:31:27 +01:00
Thibault Delavallée
cd290565a4
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl
2012-12-19 10:39:24 +01:00
Olivier Dony
03b6acd13d
[MERGE] Access inherited product fields on the product directly rather than template, courtesy of Alexis de Lattre (Akretion)
...
It makes the code a little more straightforward and does not hurt.
bzr revid: odo@openerp.com-20121218225015-6r9ydxjlh147m3z1
2012-12-18 23:50:15 +01:00
Thibault Delavallée
b95b32d644
[MERGE] Merged branch holding subtype work by APA.
...
bzr revid: tde@openerp.com-20121218131142-2jb6wac6y9q6dc7v
2012-12-18 14:11:42 +01:00
Cecile Tonglet
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Foram Katharotiya (OpenERP)
6ebeb076c3
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121217051643-o8j4hz7w8thwbymi
2012-12-17 10:46:43 +05:30
Fabien Pinckaers
160cafa249
[MERGE] fix: do not reinvoice customer invoices
...
bzr revid: fp@tinyerp.com-20121215171202-841po7g5xjqgmwy7
2012-12-15 18:12:02 +01:00
Vo Minh Thu
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Foram Katharotiya (OpenERP)
955f2588a2
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121210045724-sk2hk8mmi8iahfwn
2012-12-10 10:27:24 +05:30
Tejas Tank
392f1913f3
Merged Latest.
...
bzr revid: tta@openerp.com-20121207112002-jtes7j1er6leyd89
2012-12-07 16:20:02 +05:00
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Thibault Delavallée
c3a3492848
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121203093454-lf21qlsuse1ve8ro
2012-12-03 10:34:54 +01:00
Tejas Tank
ec5c761b7d
[IMP] Avoid to set to_invoice 100% when 'use timesheet' set.
...
bzr revid: tta@openerp.com-20121129141529-avzooa3gxgtpv32d
2012-11-29 19:15:29 +05:00
Rifakat (OpenERP)
0c1d497c62
[FIX]hr_timesheet_invoice: Fix issue Invoice tasks creates new tasks to invoice
...
lp bug: https://launchpad.net/bugs/948876 fixed
bzr revid: mma@tinyerp.com-20121128122940-96pwz3ot6j5zgym6
2012-11-28 17:59:40 +05:30
Quentin (OpenERP)
e037bc48e9
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121128114002-yk9zk24rk79v4pkd
2012-11-28 12:40:02 +01:00
Quentin (OpenERP)
21baf8dfac
[FIX] hr_timesheet_invoice: fixed ambigous reference in sql query. Fixed the redbot
...
bzr revid: qdp-launchpad@openerp.com-20121128112645-5r42r5tajeq0fzs8
2012-11-28 12:26:45 +01:00
Quentin (OpenERP)
b296312be9
[FIX] hr_timesheet_invoice: fixing the redbot
...
bzr revid: qdp-launchpad@openerp.com-20121127144338-j2803m1x08xwr6v4
2012-11-27 15:43:38 +01:00
Quentin (OpenERP)
6f256d41db
[FIX] account_analytic_contract, analytic_contract_hr_expense, hr_timesheet_invoice: fixed the computation of *to_invoice fields
...
bzr revid: qdp-launchpad@openerp.com-20121127120737-5xeed6lobynqf10l
2012-11-27 13:07:37 +01:00
Foram Katharotiya (OpenERP)
f94f396d04
[IMP] remove subtype canceled & stage change
...
bzr revid: fka@tinyerp.com-20121123114157-ckoygs2ul6hrutqv
2012-11-23 17:11:57 +05:30
Foram Katharotiya (OpenERP)
742ad1b56e
[IMP] add subtype in sales team
...
bzr revid: fka@tinyerp.com-20121119131411-64g1l1mu9y0zrzij
2012-11-19 18:44:11 +05:30
Fabien Pinckaers
367edaad26
[IMP] order of invoice types
...
bzr revid: fp@openerp.com-20121103134512-mwkqzsnz3ndy5fsb
2012-11-03 14:45:12 +01:00
Fabien Pinckaers
726a8e6c10
[MERGE] useability improvement
...
bzr revid: fp@tinyerp.com-20121102083612-xb2qvaqhgxunfipg
2012-11-02 09:36:12 +01:00
Saurang Suthar
a0e65cecc8
[MERGE]:merged with main addons
...
bzr revid: ssu@tinyerp.com-20121025101308-4h46y6lgyaxctz2m
2012-10-25 15:43:08 +05:30
Fabien Pinckaers
bde73ca622
[MERGE] hr improvements in board
...
bzr revid: fp@tinyerp.com-20121022163949-m1yv3b7sysgu3951
2012-10-22 18:39:49 +02:00
Saurang Suthar
602d96b45e
[MERGE] merge with lp:openobject-addons
...
bzr revid: ssu@tinyerp.com-20121022084635-lun43msy3ljr4srt
2012-10-22 14:16:35 +05:30
Saurang Suthar
809c4f1ed8
[IMP]hr_timesheet_invoice:fixed the issue of traceback while closing or canceling the contract
...
bzr revid: ssu@tinyerp.com-20121016132012-l8cmrr873syfvr1q
2012-10-16 18:50:12 +05:30
Atul Patel (OpenERP)
87e8959205
[FIX]
...
bzr revid: atp@tinyerp.com-20121011174126-lii90i9fnfhfsy9v
2012-10-11 23:11:26 +05:30
Atul Patel (OpenERP)
53c70856c3
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121011153329-nssuw7jzxzfjyhm7
2012-10-11 21:03:29 +05:30
Atul Patel (OpenERP)
b27b12db1b
[FIX]: Fix onchange account id problem
...
bzr revid: atp@tinyerp.com-20121011121201-h6030emuz00t55nv
2012-10-11 17:42:01 +05:30
Fabien Pinckaers
5c4348f7fe
[FIX] HR useability improvements
...
bzr revid: fp@openerp.com-20121010192927-6ud5e3zvhp5gabip
2012-10-10 21:29:27 +02:00
Atul Patel (OpenERP)
e2a28b011a
[FIX]: Fix on_change_analytic_id problem
...
bzr revid: atp@tinyerp.com-20121010150849-u4cldadvfjzmw8mj
2012-10-10 20:38:49 +05:30
Atul Patel (OpenERP)
98eaf2c2bc
[FIX]: Fix on_change_account_id() argument problem
...
bzr revid: atp@tinyerp.com-20121010103450-n4gt4ikp05t6b8yu
2012-10-10 16:04:50 +05:30
Jalpesh Patel (OpenERP)
4b88980282
[IMP]hr dashboard and fix problem of creating timesheet lines (user is employee + partner manager + sales manager)
...
bzr revid: pja@tinyerp.com-20121009115928-t7cnt9pox8hy2cs6
2012-10-09 17:29:28 +05:30
Ajay Chauhan (OpenERP)
05fc9d4baf
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121005052059-6pshnhosxtr3xi8r
2012-10-05 10:50:59 +05:30
Fabien Pinckaers
c93d70e919
[MERGE] chm - improved subtype - fixes
...
bzr revid: fp@openerp.com-20121002204023-8v3jf2n84xe2jol9
2012-10-02 22:40:23 +02:00