[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a35a44: Fix margin calculation proble
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] a35a44: Fix margin calculation problem |
Date: |
Tue, 07 May 2013 04:09:22 -0700 |
Branch: refs/heads/3.4
Home: https://github.com/Dolibarr/dolibarr
Commit: a35a44b23e73487d42c5eb4ab7994b7c6a49704a
https://github.com/Dolibarr/dolibarr/commit/a35a44b23e73487d42c5eb4ab7994b7c6a49704a
Author: fhenry <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Fix margin calculation problem
Commit: 1c9caeb0d31c9c2665808423bb5cd72ab2775ada
https://github.com/Dolibarr/dolibarr/commit/1c9caeb0d31c9c2665808423bb5cd72ab2775ada
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/core/login/README.txt
Log Message:
-----------
Fix: CRLF
Commit: 95e44749066eb05980b786255e33e22d0678fd6f
https://github.com/Dolibarr/dolibarr/commit/95e44749066eb05980b786255e33e22d0678fd6f
Author: fhenry <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Fix bug on PgSQL if user in on another entity than 1
Commit: bdb81803bdae918d985830c6c4a57722a406badc
https://github.com/Dolibarr/dolibarr/commit/bdb81803bdae918d985830c6c4a57722a406badc
Author: fhenry <address@hidden>
Date: 2013-05-04 (Sat, 04 May 2013)
Changed paths:
M htdocs/comm/index.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/login/README.txt
M htdocs/filefunc.inc.php
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Commit: 8bd7c6a763b57461dc8316b6cceb70fd2987226f
https://github.com/Dolibarr/dolibarr/commit/8bd7c6a763b57461dc8316b6cceb70fd2987226f
Author: fhenry <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/langs/fr_FR/dict.lang
Log Message:
-----------
Fix Trad Fr
Commit: 0bb9ee158afb2461ff70961f9c69c8e924c96339
https://github.com/Dolibarr/dolibarr/commit/0bb9ee158afb2461ff70961f9c69c8e924c96339
Author: fhenry <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Fix trigger call ficher inter create
Commit: 934657cc2f9cb81210d5c29f76449ea68919ee29
https://github.com/Dolibarr/dolibarr/commit/934657cc2f9cb81210d5c29f76449ea68919ee29
Author: Juanjo Menent <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/langs/fr_FR/dict.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge pull request #916 from FHenry/3.3
Fix margin calculation problem
Commit: 3aa049b6611d6de065fdc3c340bc5e2b62dc158b
https://github.com/Dolibarr/dolibarr/commit/3aa049b6611d6de065fdc3c340bc5e2b62dc158b
Author: Regis Houssin <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/contact/class/contact.class.php
Log Message:
-----------
Fix: regression
Commit: 8a82c8c5d56b46a16160bb197288f723df4cc709
https://github.com/Dolibarr/dolibarr/commit/8a82c8c5d56b46a16160bb197288f723df4cc709
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/contact/class/contact.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/tabs/productMargins.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/margin/agentMargins.php
htdocs/margin/tabs/productMargins.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/c28ef8a5578e...8a82c8c5d56b