Commit Graph
34754 Commits
Author SHA1 Message Date
Mustufa Rangwala 74f4f831dd bug fix on stock
bzr revid: mra@tinyerp.com-20081105092504-jezr3lb9bx4ii9xe
2008-11-05 14:55:04 +05:30
apa-tiny 78cd1bc850 remove print
bzr revid: patelamit2003@gmail.com-20081105092257-nfal73jmcwk85txf
2008-11-05 14:52:57 +05:30
apa-tiny 9000f79396 Both General ledger completed
bzr revid: patelamit2003@gmail.com-20081105091850-944ly91s4zlfrapb
2008-11-05 14:48:50 +05:30
Naresh Choksy f58297b93d merge
bzr revid: nch@tinyerp.com-20081105084753-4xs0i9b5l1krja7k
2008-11-05 14:17:53 +05:30
Rucha Patel 12b84d1dcd My Changes(warning.py,mrp.py) that are left to be included in Merge
bzr revid: ruchakpatel@gmail.com-20081105083551-q7b1zpvnothdszr1
2008-11-05 14:05:51 +05:30
Rucha Patel 04a6747935 Merge with addons
bzr revid: ruchakpatel@gmail.com-20081105073257-wtrepg5r9tnw054h
2008-11-05 13:02:57 +05:30
Rucha Patel 3d192a9e28 Changes according to addons resolving conflicts
bzr revid: ruchakpatel@gmail.com-20081105072430-wp3rr261q1ar8yck
2008-11-05 12:54:30 +05:30
apa-tiny 75472ce889 In General ledger landscape : Balance sum is not correct-solved (Vir)
bzr revid: patelamit2003@gmail.com-20081105055708-r4jx13woo8h7bnzh
2008-11-05 11:27:08 +05:30
P. Christeas 8220e0ad02 Merge commit 'origin/master' into mdv-gpl3
Conflicts:
	bin/tools/convert.py

bzr revid: p_christ@hol.gr-20081025224421-g367ati5b2eeplw6
bzr revid: p_christ@hol.gr-20081104201238-oy0vgsunt2jxgu2p
2008-11-04 22:12:38 +02:00
Fabien Pinckaers 055921341c merge
bzr revid: vmt@openerp.com-20081104162216-vrbjrkewfuejwj3r
2008-11-04 17:22:16 +01:00
Fabien Pinckaers d10c8a13ef improve
bzr revid: fp@tinyerp.com-20081104162045-7455pexo58kjym3i
2008-11-04 17:20:45 +01:00
Fabien Pinckaers 2b526cba50 improved_crm
bzr revid: fp@tinyerp.com-20081104153938-xgp2o8khu1wghjd4
2008-11-04 16:39:38 +01:00
Fabien Pinckaers b0815e4136 improvement
bzr revid: fp@tinyerp.com-20081104152406-190qgoihr9fcpn2y
2008-11-04 16:24:06 +01:00
Naresh Choksy 0181b1a2ca merges
bzr revid: nch@tinyerp.com-20081104125313-a5fu7bodj6guf8tx
2008-11-04 18:23:13 +05:30
apa-tiny 39100bd803 remove print
bzr revid: patelamit2003@gmail.com-20081104124955-c2srn6lth8tmqft7
2008-11-04 18:19:55 +05:30
apa-tiny 7afcbc79ee small changes - (Viral Rami)
bzr revid: patelamit2003@gmail.com-20081104124801-ymm1j43zdj827c0j
2008-11-04 18:18:01 +05:30
Mustufa Rangwala 4926e9a9d0 bug fix on account_payment
bzr revid: mra@tinyerp.com-20081104123547-orzs8stmnesalnzi
2008-11-04 18:05:47 +05:30
apa-tiny 601c4118dd AttributeError: 'NoneType' object has no attribute 'wrapOn'--Solved
bzr revid: patelamit2003@gmail.com-20081104122528-w6u8wzwxqb92cu59
2008-11-04 17:55:28 +05:30
hda@tinyerp.com 44f4cd80f0 added graph view in purchase_report
bzr revid: hda@tinyerp.com-20081104111506-q34zlv0iws91wgpk
2008-11-04 16:45:06 +05:30
Najlaa 400e543519 merge (again)
bzr revid: nel@silver-20081104105752-ups5lkz6zlcjlelr
2008-11-04 11:57:52 +01:00
Christophe Simonis d2f3b24e5f merge from smile
bzr revid: christophe@tinyerp.com-20081104105008-hu0bl41w5427mg3p
2008-11-04 11:50:08 +01:00
Najlaa 0f68572550 merge
bzr revid: nel@silver-20081104103020-iiq4d8qdkcytcl66
2008-11-04 11:30:20 +01:00
Sofia bc41b4add4 added views and demo data for claims and phone calls
bzr revid: sahibsofia@gmail.com-20081104102219-1qsv957peetq6suz
2008-11-04 15:52:19 +05:30
apa-tiny 4713caafb1 Add General ledger Landscape
bzr revid: patelamit2003@gmail.com-20081104101008-69shfmg8jjs08lg7
2008-11-04 15:40:08 +05:30
Najlaa 2313e3b25f merge
bzr revid: nel@silver-20081104090006-p3wkxbc0syl7332t
2008-11-04 10:00:06 +01:00
apa-tiny 00e0e94a27 General ledger landscape prob solved...
bzr revid: patelamit2003@gmail.com-20081104083546-rju6owjndl3x0ass
2008-11-04 14:05:46 +05:30
Fabien Pinckaers 3f8a4431ae imprvoment
bzr revid: fp@tinyerp.com-20081104072242-iatehz25pk66lbo1
2008-11-04 08:22:42 +01:00
Mantavya Gajjar cd02196d3d test commit
bzr revid: mga@tinyerp.com-20081104070405-25i73uuf97gq3qga
2008-11-04 12:34:05 +05:30
Jay Vora 1f1556ffba Added subtype arguement for emailing HTML format emails.
bzr revid: jvo@tinyerp.com-20081104063323-1xokh2az5bvbwyp9
2008-11-04 12:03:23 +05:30
Mantavya Gajjar b01b84a4d6 merging from the trunk
bzr revid: mga@mga-laptop-20081104062128-7ju0e35r8i8lhwbr
2008-11-04 11:51:28 +05:30
Naresh Choksy 2a4096b752 merges
bzr revid: nch@tinyerp.com-20081104054645-pqtvoho3hiyjb2yf
2008-11-04 11:16:45 +05:30
Mustufa Rangwala da8aa7411a changes for postgres view on stock module
bzr revid: mra@tinyerp.com-20081104052909-p92082i0d8qvqrt1
2008-11-04 10:59:09 +05:30
Jay Vora 7460c0e716 l10n_fr:Bugfixed
bzr revid: jvo@tinyerp.com-20081104050029-uu8tb2vajfbh59qm
2008-11-04 10:30:29 +05:30
apa-tiny 90a8cd9a6a Remove print
bzr revid: patelamit2003@gmail.com-20081104045144-a112lopu5supv79c
2008-11-04 10:21:44 +05:30
Christophe Simonis 0b832aa243 bugfix
bzr revid: christophe@tinyerp.com-20081103212227-sbo30bztg8r3otl8
2008-11-03 22:22:27 +01:00
Christophe Simonis 62977c6be1 bugfix
bzr revid: christophe@tinyerp.com-20081103212125-pm312gznxolohpim
2008-11-03 22:21:25 +01:00
Christophe Simonis e50667db5d merge
bzr revid: christophe@tinyerp.com-20081103192107-k33cd1dm4n82006p
2008-11-03 20:21:07 +01:00
Christophe Simonis f5fad0ba30 passing modules in GPL-3
bzr revid: christophe@tinyerp.com-20081103191856-jhcivvwb16fvz2os
2008-11-03 20:18:56 +01:00
Christophe Simonis 46e878b834 modifs
bzr revid: christophe@tinyerp.com-20081103191413-950hgvdnyuza7ime
2008-11-03 20:14:13 +01:00
Christophe Simonis 9dbe80c900 modifs
bzr revid: christophe@tinyerp.com-20081103190855-uzumzgtbuyikf70b
2008-11-03 20:08:55 +01:00
Christophe Simonis d2de2a2769 change licence
bzr revid: christophe@tinyerp.com-20081103183825-23dguh69c8nh3h7n
2008-11-03 19:38:25 +01:00
Stephane Wirtel b7e2cc8cd8 Remove the version in the name
bzr revid: stephane@tinyerp.com-20081103183717-ph27lnymh63ur8kd
2008-11-03 13:37:17 -05:00
Christophe Simonis e404e54e38 passing in GPL-3
bzr revid: christophe@tinyerp.com-20081103182716-6c6xyeewubx4uas0
2008-11-03 19:27:16 +01:00
Christophe Simonis a5c7360280 improvement
bzr revid: christophe@tinyerp.com-20081103182013-9b7ak4p7fx3lz1og
2008-11-03 19:20:13 +01:00
Christophe Simonis c619a6fdec allow more specific gpl licencing of modules
bzr revid: christophe@tinyerp.com-20081103181928-kgx86tqic4oum6l7
2008-11-03 19:19:28 +01:00
Stephane Wirtel e331bbe139 Merge from Christophe
bzr revid: stephane@tinyerp.com-20081103181632-l2d6q54vqv8dia2x
2008-11-03 19:16:32 +01:00
Stephane Wirtel 4c8c4604d1 Change the version of GPL
bzr revid: stephane@tinyerp.com-20081103181149-pb82brn8yybbuss0
2008-11-03 19:11:49 +01:00
Stephane Wirtel 71531c3a57 Use the new icon (temp)
bzr revid: stephane@tinyerp.com-20081103172613-hrmevdm06gu8y5j9
2008-11-03 12:26:13 -05:00
Stephane Wirtel 8286fe5df4 Use the new icon (temp)
bzr revid: stephane@tinyerp.com-20081103171602-yo8k8xw19mphdcmc
2008-11-03 12:16:02 -05:00
Stephane Wirtel eeb0f8c5ae Add the copyright and use the version
bzr revid: stephane@tinyerp.com-20081103155736-b4fg6yblt1gvmit2
2008-11-03 10:57:36 -05:00