[Dolibarr-git] [Dolibarr/dolibarr] 4f43ec: Add extrafield tables

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4f43ec0acf03bc9e3347e21d42538212557f3ef1
      
https://github.com/Dolibarr/dolibarr/commit/4f43ec0acf03bc9e3347e21d42538212557f3ef1
  Author: Florian Henry <address@hidden>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M htdocs/core/class/extrafields.class.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    A htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
    A htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
    A htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_propaldet_extrafields.sql

  Log Message:
  -----------
  Add extrafield tables


  Commit: 9f03074127264712dca11808130c1efe04471e18
      
https://github.com/Dolibarr/dolibarr/commit/9f03074127264712dca11808130c1efe04471e18
  Author: Florian Henry <address@hidden>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M ChangeLog
    A htdocs/admin/orderdet_extrafields.php
    A htdocs/comm/admin/propaldet_extrafields.php
    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/compta/facture.php
    A htdocs/compta/facture/admin/facturedet_cust_extrafields.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonorder.class.php
    M htdocs/core/lib/invoice.lib.php
    M htdocs/core/lib/order.lib.php
    M htdocs/core/lib/propal.lib.php
    M htdocs/core/tpl/freeproductline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/predefinedproductline_create.tpl.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/admin.lang

  Log Message:
  -----------
  - New: [ task #926 ] Add extrafield feature on order lines
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines


  Commit: b4485efdeb9402854f94b60cb5e4db07f69e534d
      
https://github.com/Dolibarr/dolibarr/commit/b4485efdeb9402854f94b60cb5e4db07f69e534d
  Author: Florian Henry <address@hidden>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M htdocs/core/boxes/box_comptes.php
    M htdocs/core/class/hookmanager.class.php
    A htdocs/core/class/html.formcontract.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/fichinter/fiche.php
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/agenda.lang
    M htdocs/langs/tr_TR/banks.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/langs/tr_TR/bookmarks.lang
    M htdocs/langs/tr_TR/boxes.lang
    M htdocs/langs/tr_TR/cashdesk.lang
    M htdocs/langs/tr_TR/categories.lang
    M htdocs/langs/tr_TR/commercial.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/langs/tr_TR/compta.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/deliveries.lang
    M htdocs/langs/tr_TR/dict.lang
    M htdocs/langs/tr_TR/donations.lang
    M htdocs/langs/tr_TR/ecm.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/exports.lang
    M htdocs/langs/tr_TR/externalsite.lang
    M htdocs/langs/tr_TR/ftp.lang
    M htdocs/langs/tr_TR/help.lang
    M htdocs/langs/tr_TR/holiday.lang
    M htdocs/langs/tr_TR/install.lang
    M htdocs/langs/tr_TR/interventions.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/tr_TR/ldap.lang
    M htdocs/langs/tr_TR/mailmanspip.lang
    M htdocs/langs/tr_TR/mails.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/margins.lang
    M htdocs/langs/tr_TR/members.lang
    M htdocs/langs/tr_TR/orders.lang
    M htdocs/langs/tr_TR/oscommerce.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/tr_TR/paybox.lang
    M htdocs/langs/tr_TR/paypal.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/tr_TR/propal.lang
    M htdocs/langs/tr_TR/sendings.lang
    M htdocs/langs/tr_TR/shop.lang
    M htdocs/langs/tr_TR/sms.lang
    M htdocs/langs/tr_TR/stocks.lang
    M htdocs/langs/tr_TR/suppliers.lang
    M htdocs/langs/tr_TR/trips.lang
    M htdocs/langs/tr_TR/users.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    M htdocs/langs/tr_TR/workflow.lang
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.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

  Log Message:
  -----------
  Merge branch 'develop' into develop_926_927_928

Conflicts:
        htdocs/core/class/extrafields.class.php

Change-Id: Ia54e1be6954bc28f81122e88e398bda8059ab536


  Commit: 34965ee541d7b390bb955338f0754a5ef6b0e5b8
      
https://github.com/Dolibarr/dolibarr/commit/34965ee541d7b390bb955338f0754a5ef6b0e5b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ChangeLog
    A htdocs/admin/orderdet_extrafields.php
    A htdocs/comm/admin/propaldet_extrafields.php
    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/compta/facture.php
    A htdocs/compta/facture/admin/facturedet_cust_extrafields.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonorder.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/lib/invoice.lib.php
    M htdocs/core/lib/order.lib.php
    M htdocs/core/lib/propal.lib.php
    M htdocs/core/tpl/freeproductline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/predefinedproductline_create.tpl.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    A htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
    A htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
    A htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/admin.lang

  Log Message:
  -----------
  Merge pull request #1040 from FHenry/develop_926_927_928

task 926 927 928


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bf2fa3158599...34965ee541d7