[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7d8cf9: FIX: bad margin and buy_price
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7d8cf9: FIX: bad margin and buy_price calculation when tot... |
Date: |
Sun, 23 Nov 2014 07:52:26 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7d8cf99d58a61603ae52cc4cf429b505ba9e79d8
https://github.com/Dolibarr/dolibarr/commit/7d8cf99d58a61603ae52cc4cf429b505ba9e79d8
Author: Christophe Battarel <address@hidden>
Date: 2014-11-19 (Wed, 19 Nov 2014)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
FIX: bad margin and buy_price calculation when total_ht = 0 (discount
100%) on a line
Commit: 891f8d9442d5532dba9a3440c8028caf31ff02c4
https://github.com/Dolibarr/dolibarr/commit/891f8d9442d5532dba9a3440c8028caf31ff02c4
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/webservices/server_contact.php
Log Message:
-----------
Fix bug 1692 Can't update phone_pro with the contact webservice
Commit: b2a1408d8eb4d1c50f984b6e2cd816fabecae5aa
https://github.com/Dolibarr/dolibarr/commit/b2a1408d8eb4d1c50f984b6e2cd816fabecae5aa
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/fourn/product/list.php
Log Message:
-----------
Fix 1667 Pagination is only partially shown in supplier references list
Commit: ffd435d9fff997dbc1f2959c16dc0597809f0300
https://github.com/Dolibarr/dolibarr/commit/ffd435d9fff997dbc1f2959c16dc0597809f0300
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Fix 1662 Search filter display discrepancy
Commit: 97a6bd842d567039f7cfed5af4782b7bcbcae581
https://github.com/Dolibarr/dolibarr/commit/97a6bd842d567039f7cfed5af4782b7bcbcae581
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/langs/en_US/stocks.lang
M htdocs/product/class/product.class.php
M htdocs/product/stock/index.php
M htdocs/product/stock/product.php
Log Message:
-----------
Minor fixes.
Commit: 3aef9d928b7213d68c1947caee1c936d5121412e
https://github.com/Dolibarr/dolibarr/commit/3aef9d928b7213d68c1947caee1c936d5121412e
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Fix: W3C
Commit: 1c1e2ed246370df5db6d1e6609e55300b229dfaf
https://github.com/Dolibarr/dolibarr/commit/1c1e2ed246370df5db6d1e6609e55300b229dfaf
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/public/test/test_forms.php
Log Message:
-----------
Better comment
Commit: eb569fe23526f7b1e553a136518928c6bd69b0aa
https://github.com/Dolibarr/dolibarr/commit/eb569fe23526f7b1e553a136518928c6bd69b0aa
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Fixed [ bug #1712 ] Unable to add a social charge
Commit: 989cd87446522513fd7f886a19803c12200d1fe4
https://github.com/Dolibarr/dolibarr/commit/989cd87446522513fd7f886a19803c12200d1fe4
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Merge pull request #2066 from altatof/fix_margin_recap
FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on
a line
Commit: bd8391163a04ce2a193a472ee31c5196ed8689b6
https://github.com/Dolibarr/dolibarr/commit/bd8391163a04ce2a193a472ee31c5196ed8689b6
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/webservices/server_contact.php
Log Message:
-----------
Merge pull request #2067 from frederic34/patch-2
Fix bug 1692 Can't update phone_pro with the contact webservice
Commit: becbf9eada5af6b61e0c5931c38f6699d9a523b7
https://github.com/Dolibarr/dolibarr/commit/becbf9eada5af6b61e0c5931c38f6699d9a523b7
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/fourn/product/list.php
Log Message:
-----------
Merge pull request #2068 from frederic34/patch-3
Fix 1667 Pagination is only partially shown in supplier references list
Commit: 7678f9b13c9ce5e9fe0fee321a61acfed936c405
https://github.com/Dolibarr/dolibarr/commit/7678f9b13c9ce5e9fe0fee321a61acfed936c405
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Merge pull request #2069 from frederic34/patch-4
Fix 1662 Search filter display discrepancy
Commit: 1f986014f114c90c367110e258d33487d5360052
https://github.com/Dolibarr/dolibarr/commit/1f986014f114c90c367110e258d33487d5360052
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/webservices/server_contact.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 1635f725c8553e651d708945d9ee3d26cc0c0c8b
https://github.com/Dolibarr/dolibarr/commit/1635f725c8553e651d708945d9ee3d26cc0c0c8b
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/webservices/server_contact.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: 245a06d43360731c5e36eea7e916b766d7ca6ee8
https://github.com/Dolibarr/dolibarr/commit/245a06d43360731c5e36eea7e916b766d7ca6ee8
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fourn/product/list.php
M htdocs/langs/en_US/stocks.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/product/admin/product_tools.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/stock/index.php
M htdocs/product/stock/product.php
M htdocs/public/test/test_forms.php
M htdocs/webservices/server_contact.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/99e7004bb6a0...245a06d43360