[Dolibarr-git] [Dolibarr/dolibarr] f0a7cc: Select Shipping Method in Propal

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f0a7cc3268076f5b2097ec6a68408fb26bd6162c
      
https://github.com/Dolibarr/dolibarr/commit/f0a7cc3268076f5b2097ec6a68408fb26bd6162c
  Author: frederic34 <address@hidden>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_propal.sql

  Log Message:
  -----------
  Select Shipping Method in Propal


  Commit: 4fcff3e2e5d7956533c90f608f29e7d1abd3c311
      
https://github.com/Dolibarr/dolibarr/commit/4fcff3e2e5d7956533c90f608f29e7d1abd3c311
  Author: frederic34 <address@hidden>
  Date:   2014-07-25 (Fri, 25 Jul 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_commande.sql

  Log Message:
  -----------
  Select delivery method for order


  Commit: 2df2c12cfd455129407efa6c46b783d434bcbe82
      
https://github.com/Dolibarr/dolibarr/commit/2df2c12cfd455129407efa6c46b783d434bcbe82
  Author: frederic34 <address@hidden>
  Date:   2014-07-25 (Fri, 25 Jul 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/expedition/shipment.php

  Log Message:
  -----------
  The delivery method is transmited in shipment


  Commit: 5258c522ce58339a7cd93e6db9dd84edc4536571
      
https://github.com/Dolibarr/dolibarr/commit/5258c522ce58339a7cd93e6db9dd84edc4536571
  Author: frederic34 <address@hidden>
  Date:   2014-07-25 (Fri, 25 Jul 2014)

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

  Log Message:
  -----------
  Some cleaning


  Commit: 0450498e2b4b52254daecc0350008ec4334c963c
      
https://github.com/Dolibarr/dolibarr/commit/0450498e2b4b52254daecc0350008ec4334c963c
  Author: frederic34 <address@hidden>
  Date:   2014-07-26 (Sat, 26 Jul 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Add restriction to combo box


  Commit: 395b00326657e44ca918c0d66fd3d033a191d722
      
https://github.com/Dolibarr/dolibarr/commit/395b00326657e44ca918c0d66fd3d033a191d722
  Author: frederic34 <address@hidden>
  Date:   2014-07-28 (Mon, 28 Jul 2014)

  Changed paths:
    M ChangeLog
    M build/debian/README.howto
    M build/makepack-dolibarr.pl
    M build/rpm/conf.php
    M dev/codesniffer/ruleset.xml
    M htdocs/admin/dict.php
    A htdocs/admin/system/browser.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/boutique/index.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/compta/facture.php
    A htdocs/core/class/MobileDetect.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formadmin.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/db/sqlite.class.php
    M htdocs/core/filemanagerdol/connectors/php/basexml.php
    M htdocs/core/filemanagerdol/connectors/php/io.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/fiche.php
    M htdocs/install/mysql/data/llx_c_shipment_mode.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/mailmanspip/class/mailmanspip.class.php
    M htdocs/main.inc.php
    M htdocs/public/test/test_arrays.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_thirdparty.php
    M test/phpunit/Functions2LibTest.php

  Log Message:
  -----------
  Merge remote branch 'upstream/develop' into selectdelivery

Conflicts:
        htdocs/install/mysql/migration/3.6.0-3.7.0.sql


  Commit: 6d5767e464ec02b0f7e49c8b03f5b02b376cb41f
      
https://github.com/Dolibarr/dolibarr/commit/6d5767e464ec02b0f7e49c8b03f5b02b376cb41f
  Author: frederic34 <address@hidden>
  Date:   2014-07-28 (Mon, 28 Jul 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/core/boxes/box_activity.php
    R htdocs/core/class/MobileDetect.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formmail.class.php
    A htdocs/core/class/mobiledetect.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Merge remote branch 'upstream/develop' into selectdelivery


  Commit: 2d97ad5177fd41bb7921a86be045352ff54ef75e
      
https://github.com/Dolibarr/dolibarr/commit/2d97ad5177fd41bb7921a86be045352ff54ef75e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/expedition/shipment.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_commande.sql
    M htdocs/install/mysql/tables/llx_propal.sql

  Log Message:
  -----------
  Merge pull request #1771 from frederic34/selectdelivery

Select Shipping Method in Propal, Order


Compare: 
https://github.com/Dolibarr/dolibarr/compare/36c4d272e773...2d97ad5177fd