[Dolibarr-git] [Dolibarr/dolibarr] ec5a09: FIX : Do not include separate extrafields into exp...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ec5a094d27a767f5c742a75c9d85cbc72a28440d
      
https://github.com/Dolibarr/dolibarr/commit/ec5a094d27a767f5c742a75c9d85cbc72a28440d
  Author: florian HENRY <address@hidden>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

  Changed paths:
    M htdocs/core/extrafieldsinexport.inc.php

  Log Message:
  -----------
  FIX : Do not include separate extrafields into export cause "separate"
extrafields aren't sql column


  Commit: 9da324031c1d3bec50a04b49de22f1de54757ba5
      
https://github.com/Dolibarr/dolibarr/commit/9da324031c1d3bec50a04b49de22f1de54757ba5
  Author: florian HENRY <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/commande/contact.php
    M htdocs/commande/document.php
    M htdocs/commande/note.php
    M htdocs/contrat/card.php
    M htdocs/contrat/contact.php
    M htdocs/contrat/document.php
    M htdocs/contrat/info.php
    M htdocs/contrat/note.php
    M htdocs/core/lib/fichinter.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/contact.php
    M htdocs/fichinter/document.php
    M htdocs/fichinter/info.php
    M htdocs/fichinter/note.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/contact.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/commande/note.php
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_CH/stocks.lang
    M htdocs/langs/en_US/languages.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/es_CL/companies.lang
    M htdocs/langs/es_CL/orders.lang
    M htdocs/langs/es_MX/admin.lang
    R htdocs/langs/es_MX/products.lang
    M htdocs/langs/fr_CA/admin.lang
    M htdocs/langs/fr_CA/products.lang
    A htdocs/langs/km_KH/accountancy.lang
    A htdocs/langs/km_KH/admin.lang
    A htdocs/langs/km_KH/agenda.lang
    A htdocs/langs/km_KH/banks.lang
    A htdocs/langs/km_KH/bills.lang
    A htdocs/langs/km_KH/bookmarks.lang
    A htdocs/langs/km_KH/boxes.lang
    A htdocs/langs/km_KH/cashdesk.lang
    A htdocs/langs/km_KH/categories.lang
    A htdocs/langs/km_KH/commercial.lang
    A htdocs/langs/km_KH/companies.lang
    A htdocs/langs/km_KH/compta.lang
    A htdocs/langs/km_KH/contracts.lang
    A htdocs/langs/km_KH/cron.lang
    A htdocs/langs/km_KH/deliveries.lang
    A htdocs/langs/km_KH/dict.lang
    A htdocs/langs/km_KH/donations.lang
    A htdocs/langs/km_KH/ecm.lang
    A htdocs/langs/km_KH/errors.lang
    A htdocs/langs/km_KH/exports.lang
    A htdocs/langs/km_KH/externalsite.lang
    A htdocs/langs/km_KH/ftp.lang
    A htdocs/langs/km_KH/help.lang
    A htdocs/langs/km_KH/holiday.lang
    A htdocs/langs/km_KH/hrm.lang
    A htdocs/langs/km_KH/incoterm.lang
    A htdocs/langs/km_KH/install.lang
    A htdocs/langs/km_KH/interventions.lang
    A htdocs/langs/km_KH/languages.lang
    A htdocs/langs/km_KH/ldap.lang
    A htdocs/langs/km_KH/link.lang
    A htdocs/langs/km_KH/loan.lang
    A htdocs/langs/km_KH/mailmanspip.lang
    A htdocs/langs/km_KH/mails.lang
    A htdocs/langs/km_KH/main.lang
    A htdocs/langs/km_KH/margins.lang
    A htdocs/langs/km_KH/members.lang
    A htdocs/langs/km_KH/oauth.lang
    A htdocs/langs/km_KH/opensurvey.lang
    A htdocs/langs/km_KH/orders.lang
    A htdocs/langs/km_KH/other.lang
    A htdocs/langs/km_KH/paybox.lang
    A htdocs/langs/km_KH/paypal.lang
    A htdocs/langs/km_KH/printing.lang
    A htdocs/langs/km_KH/productbatch.lang
    A htdocs/langs/km_KH/products.lang
    A htdocs/langs/km_KH/projects.lang
    A htdocs/langs/km_KH/propal.lang
    A htdocs/langs/km_KH/receiptprinter.lang
    A htdocs/langs/km_KH/resource.lang
    A htdocs/langs/km_KH/salaries.lang
    A htdocs/langs/km_KH/sendings.lang
    A htdocs/langs/km_KH/sms.lang
    A htdocs/langs/km_KH/stocks.lang
    A htdocs/langs/km_KH/supplier_proposal.lang
    A htdocs/langs/km_KH/suppliers.lang
    A htdocs/langs/km_KH/trips.lang
    A htdocs/langs/km_KH/users.lang
    A htdocs/langs/km_KH/website.lang
    A htdocs/langs/km_KH/withdrawals.lang
    A htdocs/langs/km_KH/workflow.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/members.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/stocks.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/resource/element_resource.php

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


  Commit: e83bb0f50c1b0b51a587a423183563f07f46a982
      
https://github.com/Dolibarr/dolibarr/commit/e83bb0f50c1b0b51a587a423183563f07f46a982
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M htdocs/core/extrafieldsinexport.inc.php

  Log Message:
  -----------
  Merge pull request #6098 from atm-florian/develop

FIX : Do not include separate extrafields into export


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3b193e2e2215...e83bb0f50c1b