2fddf1729b
[FIX] product_margin: product template should be the correct one and make group bys work
...
The fact that it uses the correct template id now, fixes #6860
The read_group calculates the sum for every group for the non-stored fields as it is not possible
anymore to add it in the xml, fixes #6638
The read_group simply searches for all products in the group and sums the totals of the fields for these
products.
2015-07-27 14:48:37 +02:00
0d7e144492
[FIX] fixes of bug introduced in the previous merge with trunk
...
bzr revid: qdp-launchpad@openerp.com-20140326162208-d5m8qr8gz8fel7q1
2014-03-26 17:22:08 +01:00
e0b27b4ee8
[MERGE] merged trunk up to revision 9251
...
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
c2ba11e72e
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
...
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
9f9023b139
[ADD] Product margin UoM + product_extended
...
bzr revid: jco@openerp.com-20130605085626-6g4kvnrfgoxf3y2k
2013-06-05 10:56:26 +02:00
cfbee92a61
[IMP] Change product view for updating price, uom in product margin
...
bzr revid: jco@openerp.com-20130603151521-88glofqgcnu3u53o
2013-06-03 17:15:21 +02:00
ba19c25c63
[IMP] Change reports not to use properties, change product margin report
...
bzr revid: jco@openerp.com-20130528142550-ju7se764e9zepzx0
2013-05-28 16:25:50 +02:00
96de0c8021
[REF] procurement, product, producT_margin: some comments added during code review
...
bzr revid: qdp-launchpad@openerp.com-20130528095911-u1qjs0a2233q2shx
2013-05-28 11:59:11 +02:00
b8946be24e
division by Zero error on product_margin
...
bzr revid: rmu@tinyerp.com-20130429105859-ud19ak4j6df8hdct
2013-04-29 16:28:59 +05:30
96ea6418c6
[IMP] Change standard_price field of product into a property: requires changing SQL queries
...
bzr revid: jco@openerp.com-20130417150213-4nm9tc8nzvsgm5ix
2013-04-17 17:02:13 +02:00
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
163c118b69
[IMP] Renamed String.
...
bzr revid: bth@tinyerp.com-20121206071410-rdt5c70n5hl7uak9
2012-12-06 12:44:10 +05:30
ffe51235d3
[FIX]product_margin :fix computation of expected_margin and normal_cost in query, it shows wrong value while product id and product_tmpl_id are different
...
bzr revid: mma@tinyerp.com-20121105103612-hoxabvlk083tqsr5
2012-11-05 16:06:12 +05:30
09a5fbba59
[IMP]all: improve some tool-tip
...
bzr revid: mma@tinyerp.com-20120720092653-197y2amboq3hv9e5
2012-07-20 14:56:53 +05:30
71122ae47a
[IMP]tooltip : I have changed the tooltip of fields as suggested
...
bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
2012-07-13 15:47:51 +05:30
06fb14130a
[IMP] removed method=True params from all fields.function
...
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!
bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
27e3559326
[FIX]:product_margin purchases values in sales
...
lp bug: https://launchpad.net/bugs/723448 fixed
bzr revid: ksa@tinyerp.co.in-20110309123538-45ufsyjrtkhj7cj1
2011-03-09 18:05:38 +05:30
9f2ba157db
fix
...
bzr revid: fp@tinyerp.com-20101105061751-z2ffuaxuqqqnvqsm
2010-11-05 07:17:51 +01:00
c5de222c66
[FIX] product_margin: same multi value for the same function field method
...
bzr revid: olt@tinyerp.com-20100928122845-rvjqg7bo6d6a009p
2010-09-28 14:28:45 +02:00
9e50339257
[FIX] product_margin: tab2space
...
bzr revid: olt@tinyerp.com-20100924113232-vy055qmmzmbtyj98
2010-09-24 13:32:32 +02:00
d781b93335
[IMP] product_margin, product_expiry,product_manufacturer: improve and cleaning
...
bzr revid: mra@mra-laptop-20100813072843-l72opp20yoiik3pg
2010-08-13 12:58:43 +05:30
a3ed9b34d4
[Fix] product_marign: fix the problem of paid state
...
bzr revid: sbh@tinyerp.com-20100618124834-dqnn0vgufy9qlrvo
2010-06-18 18:18:34 +05:30
3be7801205
[MERGE] merge with trunk addons and remove conficts
...
bzr revid: mra@mra-laptop-20100618083859-5jbrk4u9l2vojxu6
2010-06-18 14:08:59 +05:30
bf8d2a73c0
[IMP][REF] Sql-injection changes, remove print statement, some space improvement.
...
bzr revid: vra@tinyerp.com-20100616115139-cql5oiqf622spa6p
2010-06-16 17:21:39 +05:30
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
6de7835f1c
[IMP] product_margin : Improve the python code and view
...
bzr revid: sbh@tinyerp.com-20100608130611-0yi56h4wjq1m4ep3
2010-06-08 18:36:11 +05:30
441989a4eb
Task-844 :Compute the margin int stadard price
...
bzr revid: sbh@tinyerp.com-20100603095031-ntssds69fn8tunvv
2010-06-03 15:20:31 +05:30
93bd614c8e
merged to remove sql injection
...
bzr revid: hda@tinyerp.com-20100201082939-fj0u5f0pvlgq7j3k
2010-02-01 13:59:39 +05:30
fb3ef7a2f4
[FIX] Change the year of the copyright
...
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
5a4e8b8092
[IMP]: Generalization of tooltips: Improved tooltips for all fields.
...
bzr revid: uco@tinyerp.co.in-20091222064551-k6g299rk9ly1oyg3
2009-12-22 12:15:51 +05:30
8354496c6d
[FIX]:fix string problem
...
bzr revid: nch@tinyerp.com-20091125103450-gla544qdr273udgy
2009-11-25 16:04:50 +05:30
5c6eab5491
[IMP]:product_margin module sql queries to parameterized query
...
bzr revid: nch@tinyerp.com-20091124111543-onlx8d0jiyzfdmx1
2009-11-24 16:45:43 +05:30
eb0b928cc0
Changed licencing terms
...
bzr revid: hda@tinyerp.com-20091014111534-1vtk21rz8byhszzf
2009-10-14 16:45:34 +05:30
41e8ed59ef
changed encoding to coding in all py files
...
lp bug: https://launchpad.net/bugs/357182 fixed
bzr revid: hda@tinyerp.com-20091013055837-3ntnbe8b938xmk97
2009-10-13 11:28:37 +05:30
21f104a506
[IMP] Update the copyright to 2009
...
bzr revid: stephane@tinyerp.com-20090104221250-55q32ayj2t8kzb2k
2009-01-04 23:12:50 +01:00
cffb0ec168
improve
...
bzr revid: fp@tinyerp.com-20081105134714-16t6g6r5m9jfvzie
2008-11-05 14:47:14 +01:00
f5fad0ba30
passing modules in GPL-3
...
bzr revid: christophe@tinyerp.com-20081103191856-jhcivvwb16fvz2os
2008-11-03 20:18:56 +01:00
8d7ab9b8f0
* fixed bug on partial packing
...
* put date fileration on product_margin function on product_margin module
bzr revid: hmo@tinyerp.com-20081014132355-z3tkd6n7bjvh9tgo
2008-10-14 18:53:55 +05:30
7fa0283232
Improvement on product_margin
...
* remove sale & purchase dependacy
* graph view for turnover , total cost
* add a sum="..." on the fields: turnover, total margin, sales gap
in the tree
* By default the wizard propose to report on the latest year. (not empty
fields)
The title of the tab must be Margins instead of Margin. Put tooltips on
all fields that explain how they are computed.
* made new form view and set high priority
* modify states : (paid,open_paid,draft_open_paid)
bzr revid: hmo@tinyerp.com-20081010122744-5sw8yfbopt0zr04k
2008-10-10 17:57:44 +05:30
1a5ef1a587
new module : product margin
...
bzr revid: hmo@tinyerp.com-20081003142828-kcwd23dddegc9rz2
2008-10-03 19:58:28 +05:30
Josse Colpaert
Quentin (OpenERP)
Denis Ledoux
Josse Colpaert
Ravish (Open ERP)
Vo Minh Thu
Bhumi Thakkar (Open ERP)
Rifakat (OpenERP)
Mayur Maheshwari (OpenERP)
Rajesh Prajapati (OpenERP)
Olivier Dony
ksa (Open ERP)
Fabien Pinckaers
sbh (Open ERP)
Mustufa Rangwala
vra
HDA (OpenERP)
Stephane Wirtel
uco (OpenERP)
Stephane Wirtel
Christophe Simonis
Harshad Modi