[Dolibarr-git] [Dolibarr/dolibarr] 9cd8b3: Add url column into llx_product into initdata for ...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9cd8b3a2b77bcebbc6e9606e1963c09d2993d14e
      
https://github.com/Dolibarr/dolibarr/commit/9cd8b3a2b77bcebbc6e9606e1963c09d2993d14e
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.6.0.sql

  Log Message:
  -----------
  Add url column into llx_product into initdata for 3.6 (else phpunit is
not happy)


  Commit: af9fd7cabd2418d5e244d97c88675d0f94fc12b3
      
https://github.com/Dolibarr/dolibarr/commit/af9fd7cabd2418d5e244d97c88675d0f94fc12b3
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/price.lib.php
    A htdocs/core/lib/resource.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    A htdocs/core/modules/modResource.class.php
    A htdocs/core/tpl/resource_add.tpl.php
    A htdocs/core/tpl/resource_view.tpl.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/commande/liste.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    A htdocs/install/mysql/tables/llx_c_type_resource.key.sql
    A htdocs/install/mysql/tables/llx_c_type_resource.sql
    A htdocs/install/mysql/tables/llx_element_resources.key.sql
    A htdocs/install/mysql/tables/llx_element_resources.sql
    A htdocs/install/mysql/tables/llx_resource.key.sql
    A htdocs/install/mysql/tables/llx_resource.sql
    A htdocs/langs/en_US/resource.lang
    A htdocs/langs/fr_FR/resource.lang
    A htdocs/resource/add.php
    A htdocs/resource/card.php
    A htdocs/resource/class/actions_resource.class.php
    A htdocs/resource/class/html.formresource.class.php
    A htdocs/resource/class/resource.class.php
    A htdocs/resource/element_resource.php
    A htdocs/resource/img/object_resource.png
    A htdocs/resource/img/resource.png
    A htdocs/resource/list.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/webservices/server_invoice.php
    M htdocs/webservices/server_order.php
    A test/soapui/soap_createInvoice.xml

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


  Commit: 100628622ad9cbb361f49e9dc3677b6dac2a63f8
      
https://github.com/Dolibarr/dolibarr/commit/100628622ad9cbb361f49e9dc3677b6dac2a63f8
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.6.0.sql

  Log Message:
  -----------
  fix insert data from initdata3.6 form url column into llx_product


  Commit: ff454130deededb33b1877435b83827a29373872
      
https://github.com/Dolibarr/dolibarr/commit/ff454130deededb33b1877435b83827a29373872
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.6.0.sql

  Log Message:
  -----------
  add tobatch into into data product


  Commit: 26b74a53a2d4562204b3387022fd963dc414480b
      
https://github.com/Dolibarr/dolibarr/commit/26b74a53a2d4562204b3387022fd963dc414480b
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.6.0.sql
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql

  Log Message:
  -----------
  Fix initdata 3.6 for CommandeFournisseurTest.php run correctly


  Commit: c57c7fdca688070631c6d685e749baf7569a9ae2
      
https://github.com/Dolibarr/dolibarr/commit/c57c7fdca688070631c6d685e749baf7569a9ae2
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/lib/resource.lib.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/filefunc.inc.php
    M htdocs/resource/class/actions_resource.class.php
    M test/soapui/Dolibarr-soapui-project.xml

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


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

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.6.0.sql
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql

  Log Message:
  -----------
  Merge pull request #1599 from FHenry/develop

Add url column into llx_product into initdata for 3.6


Compare: 
https://github.com/Dolibarr/dolibarr/compare/376101c8b62e...add02b224e47