[Dolibarr-git] [Dolibarr/dolibarr] a35a44: Fix margin calculation proble

dolibarr-git
[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:	Mon, 13 May 2013 18:12:53 -0700
  Branch: refs/heads/3.3_backported
  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: 723bd6f7500a13d2acada3ac6c11dbd0d1a9d0e2
      
https://github.com/Dolibarr/dolibarr/commit/723bd6f7500a13d2acada3ac6c11dbd0d1a9d0e2
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-03 (Fri, 03 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/filefunc.inc.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql
(3.4-beta).
Fix: Permission tab was not visible for external users.


  Commit: c8ef07a889298273655fe2d4aa2e415715c95b47
      
https://github.com/Dolibarr/dolibarr/commit/c8ef07a889298273655fe2d4aa2e415715c95b47
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/clients.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/fiche-rejet.php
    M htdocs/compta/prelevement/fiche-stat.php
    M htdocs/compta/prelevement/lignes.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/holiday/fiche.php
    M htdocs/imports/import.php
    M htdocs/includes/nusoap/lib/Mail/PEAR.php
    M htdocs/includes/nusoap/lib/Mail/mimeDecode.php
    A htdocs/langs/ca_ES/holiday.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/product/ajax/products.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/element.php
    M htdocs/projet/fiche.php
    M test/phpunit/FilesLibTest.php

  Log Message:
  -----------
  Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3


  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: 661071286e5817e937e828e65250160ca885c248
      
https://github.com/Dolibarr/dolibarr/commit/661071286e5817e937e828e65250160ca885c248
  Author: Marcos García <address@hidden>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M dev/skeletons/modMyModule.class.php

  Log Message:
  -----------
  Typo in skeleton module class


  Commit: 9427e32e2ed54c1a2bc519a88c057207836df489
      
https://github.com/Dolibarr/dolibarr/commit/9427e32e2ed54c1a2bc519a88c057207836df489
  Author: fhenry <address@hidden>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M htdocs/adherents/fiche.php

  Log Message:
  -----------
  Fix security breach (SQL injection)


  Commit: 9992fc803ddb26d2b3e669f5ab902222b5d110c9
      
https://github.com/Dolibarr/dolibarr/commit/9992fc803ddb26d2b3e669f5ab902222b5d110c9
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M dev/skeletons/modMyModule.class.php

  Log Message:
  -----------
  Merge pull request #937 from marcosgdf/skeleton

Typo in skeleton module class


  Commit: cb3b0996ce2a7835e6ed78411601e9fd647e5cd3
      
https://github.com/Dolibarr/dolibarr/commit/cb3b0996ce2a7835e6ed78411601e9fd647e5cd3
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M htdocs/adherents/fiche.php

  Log Message:
  -----------
  Merge pull request #941 from FHenry/3.3

Fix security breach (SQL injection)


  Commit: 526a80dd202bbca396687a502d52c27e06e97fff
      
https://github.com/Dolibarr/dolibarr/commit/526a80dd202bbca396687a502d52c27e06e97fff
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-11 (Sat, 11 May 2013)

  Changed paths:
    M htdocs/core/lib/barcode.lib.php

  Log Message:
  -----------
  Sec: Param not escaped
Fix: Bad return error


  Commit: e4dda125d8d804aa9cc882998e9464eee1c58d68
      
https://github.com/Dolibarr/dolibarr/commit/e4dda125d8d804aa9cc882998e9464eee1c58d68
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-11 (Sat, 11 May 2013)

  Changed paths:
    M dev/skeletons/modMyModule.class.php
    M htdocs/adherents/fiche.php

  Log Message:
  -----------
  Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3


  Commit: 8a90598b23e1b2689848187941f7a96b04907005
      
https://github.com/Dolibarr/dolibarr/commit/8a90598b23e1b2689848187941f7a96b04907005
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-11 (Sat, 11 May 2013)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Fix: Escape entities


  Commit: 5fe70e0bee9b0db765ac644b4293aba0c65bd3af
      
https://github.com/Dolibarr/dolibarr/commit/5fe70e0bee9b0db765ac644b4293aba0c65bd3af
  Author: simnandez <address@hidden>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/langs/ca_ES/errors.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/fr_FR/errors.lang

  Log Message:
  -----------
  Fix: Some bugs on withdrawal rejects


  Commit: 82b0c075c14ca1d8851c9d9282e4d29068c45c36
      
https://github.com/Dolibarr/dolibarr/commit/82b0c075c14ca1d8851c9d9282e4d29068c45c36
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ChangeLog
    M dev/skeletons/modMyModule.class.php
    M htdocs/adherents/fiche.php
    M htdocs/comm/index.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/barcode.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/login/README.txt
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/filefunc.inc.php
    M htdocs/langs/ca_ES/errors.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/fr_FR/dict.lang
    M htdocs/langs/fr_FR/errors.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
    M htdocs/user/perms.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/351a8f5d392d...82b0c075c14c
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] a35a44: Fix margin calculation problem, Juanjo Menent, 2013/05/06
- [Dolibarr-git] [Dolibarr/dolibarr] a35a44: Fix margin calculation problem, Laurent Destailleur, 2013/05/07
- [Dolibarr-git] [Dolibarr/dolibarr] a35a44: Fix margin calculation problem, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 5fe70e: Fix: Some bugs on withdrawal rejects
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 551bcb: Fix: Try to avoid warning
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] a35a44: Fix margin calculation problem
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 4a1eb1: Fix margin calculation
Index(es):
- Date
- Thread