[Dolibarr-git] [Dolibarr/dolibarr] b47ced: Fix: syntax error

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b47ced: Fix: syntax error

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] b47ced: Fix: syntax error
Date:	Wed, 25 Jul 2012 03:27:40 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b47ced75075ab12d32de8f4301c1b69f49fe3f80
      
https://github.com/Dolibarr/dolibarr/commit/b47ced75075ab12d32de8f4301c1b69f49fe3f80
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql

  Log Message:
  -----------
  Fix: syntax error


  Commit: 276e32dc2233655b60d765d905a2664c2bf7ccba
      
https://github.com/Dolibarr/dolibarr/commit/276e32dc2233655b60d765d905a2664c2bf7ccba
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix: Products with no prices not visible


  Commit: 758d613908ab616bcc04e114992e08e687a2fb47
      
https://github.com/Dolibarr/dolibarr/commit/758d613908ab616bcc04e114992e08e687a2fb47
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M dev/codesniffer/ruleset.xml
    M htdocs/core/class/smtps.class.php

  Log Message:
  -----------
  Fix: Checkstyle


  Commit: de621f0567b6058fcea565dec023b735b0ed976b
      
https://github.com/Dolibarr/dolibarr/commit/de621f0567b6058fcea565dec023b735b0ed976b
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/product/fournisseurs.php

  Log Message:
  -----------
  Fix: Restore compatibility. Try to isolate "charges" feature with
a condition (i did not understand what it means and goal, i'm afraid
other users should not understand too).


  Commit: 7d08bd45d6317bd564e23ad4da5139425fcbc6bf
      
https://github.com/Dolibarr/dolibarr/commit/7d08bd45d6317bd564e23ad4da5139425fcbc6bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M htdocs/core/boxes/box_activity.php

  Log Message:
  -----------
  Checkstyle


  Commit: b63820c013371bc350710ef7fdbd25c91d158b6a
      
https://github.com/Dolibarr/dolibarr/commit/b63820c013371bc350710ef7fdbd25c91d158b6a
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

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

  Log Message:
  -----------
  Checkstyle


  Commit: ea5452318160fed434982cffa0c7069524448fae
      
https://github.com/Dolibarr/dolibarr/commit/ea5452318160fed434982cffa0c7069524448fae
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M dev/codesniffer/ruleset.xml
    M htdocs/install/lib/repair.lib.php

  Log Message:
  -----------
  Checkstyle


  Commit: dce9b9626033ac33b34bb4edc257ca7c02c8880c
      
https://github.com/Dolibarr/dolibarr/commit/dce9b9626033ac33b34bb4edc257ca7c02c8880c
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M dev/codesniffer/ruleset.xml
    M dev/skeletons/modMyModule.class.php
    M htdocs/adherents/document.php
    R htdocs/admin/commissions.php
    M htdocs/admin/company.php
    R htdocs/admin/margin.php
    M htdocs/admin/modules.php
    M htdocs/admin/workflow.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/fiche.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/document.php
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    A htdocs/commissions/admin/commissions.php
    M htdocs/commissions/index.php
    M htdocs/commissions/lib/commissions.lib.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/list.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/document.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/modCommissions.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modMargin.class.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/core/modules/societe/modules_societe.class.php
    M htdocs/expedition/fiche.php
    M htdocs/expedition/shipment.php
    M htdocs/exports/class/export.class.php
    M htdocs/exports/export.php
    M htdocs/fichinter/document.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/commande/document.php
    M htdocs/install/lib/repair.lib.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/commissions.lang
    M htdocs/main.inc.php
    A htdocs/margin/admin/margin.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/product/ajaxproducts.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php
    M htdocs/product/liste.php
    M htdocs/product/popuprop.php
    M htdocs/product/reassort.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php
    M htdocs/societe/document.php
    M htdocs/societe/soc.php
    R htdocs/theme/amarok/img/commissions.png
    R htdocs/theme/amarok/img/marges.png
    R htdocs/theme/amarok/img/object_marges.png
    A htdocs/theme/amarok/img/object_margin.png
    R htdocs/theme/auguria/img/commissions.png
    R htdocs/theme/auguria/img/marges.png
    R htdocs/theme/auguria/img/object_marges.png
    A htdocs/theme/auguria/img/object_margin.png
    M htdocs/theme/auguria/style.css.php
    R htdocs/theme/bureau2crea/img/commissions.png
    R htdocs/theme/bureau2crea/img/marges.png
    R htdocs/theme/bureau2crea/img/object_marges.png
    A htdocs/theme/bureau2crea/img/object_margin.png
    M htdocs/theme/bureau2crea/style.css.php
    R htdocs/theme/cameleo/img/commissions.png
    R htdocs/theme/cameleo/img/marges.png
    R htdocs/theme/cameleo/img/object_marges.png
    A htdocs/theme/cameleo/img/object_margin.png
    M htdocs/theme/cameleo/style.css.php
    R htdocs/theme/eldy/img/commissions.png
    R htdocs/theme/eldy/img/marges.png
    R htdocs/theme/eldy/img/menus/marges.png
    R htdocs/theme/eldy/img/object_marges.png
    A htdocs/theme/eldy/img/object_margin.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/webservices/server_invoice.php
    M scripts/emailings/cron-mailing-send.php
    M scripts/emailings/mailing-send.php

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

Conflicts:
        htdocs/core/lib/functions2.lib.php
        htdocs/install/lib/repair.lib.php
        htdocs/install/mysql/migration/3.2.0-3.3.0.sql


  Commit: 75e9d93e69bbaa4caf65fa90d17781324a837326
      
https://github.com/Dolibarr/dolibarr/commit/75e9d93e69bbaa4caf65fa90d17781324a837326
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/document.php
    M htdocs/contrat/fiche.php
    M htdocs/contrat/index.php
    M htdocs/contrat/liste.php
    M htdocs/contrat/services.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/expedition/shipment.php
    M htdocs/main.inc.php
    M htdocs/societe/class/companybankaccount.class.php
    M htdocs/societe/soc.php

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


  Commit: 126979efe1172931b854501f5d5c8ab859f04104
      
https://github.com/Dolibarr/dolibarr/commit/126979efe1172931b854501f5d5c8ab859f04104
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix: All "isset" must not be replaced by "GETPOST". If isset is used to
know if value is defined (and not to know if value is null), we must
keep the isset.


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7d2f7e9800fa...126979efe117
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] b47ced: Fix: syntax error, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 7d2f7e: Fix: strict mode crazy
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 70cf82: Fix: Products with no prices not visible
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 7d2f7e: Fix: strict mode crazy
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 70cf82: Fix: Products with no prices not visible
Index(es):
- Date
- Thread