[Dolibarr-git] [Dolibarr/dolibarr] 65dafe: Uniformize feature between invoice and merging too...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 65dafeee55f643e7ef6b40145bade1bb3cc9c928
      
https://github.com/Dolibarr/dolibarr/commit/65dafeee55f643e7ef6b40145bade1bb3cc9c928
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-19 (Sun, 19 Apr 2015)

  Changed paths:
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/compta/sociales/charges.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/langs/en_US/main.lang

  Log Message:
  -----------
  Uniformize feature between invoice and merging tool


  Commit: 94589b993514a4c6ccec09ee050a4520fcf05cdb
      
https://github.com/Dolibarr/dolibarr/commit/94589b993514a4c6ccec09ee050a4520fcf05cdb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-19 (Sun, 19 Apr 2015)

  Changed paths:
    M .editorconfig
    M .travis.yml
    M COPYRIGHT
    M dev/initdata/mysqldump_dolibarr_3.5.0.sql
    A dev/translation/sanity_check_en_langfiles.php
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/journaux.php
    M htdocs/accountancy/bookkeeping/balancebymonth.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/adherents/admin/adherent.php
    M htdocs/adherents/admin/adherent_extrafields.php
    M htdocs/adherents/admin/adherent_type_extrafields.php
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/agenda.php
    M htdocs/admin/agenda_extrafields.php
    M htdocs/admin/agenda_extsites.php
    M htdocs/admin/agenda_other.php
    M htdocs/admin/agenda_xcal.php
    M htdocs/admin/askpricesupplier.php
    M htdocs/admin/bank.php
    M htdocs/admin/bank_extrafields.php
    M htdocs/admin/barcode.php
    M htdocs/admin/boxes.php
    M htdocs/admin/clicktodial.php
    M htdocs/admin/commande.php
    M htdocs/admin/company.php
    M htdocs/admin/compta.php
    M htdocs/admin/confexped.php
    M htdocs/admin/const.php
    M htdocs/admin/contract.php
    M htdocs/admin/delais.php
    M htdocs/admin/dict.php
    M htdocs/admin/ecm.php
    M htdocs/admin/events.php
    M htdocs/admin/expedition.php
    M htdocs/admin/expensereport.php
    M htdocs/admin/external_rss.php
    M htdocs/admin/facture.php
    M htdocs/admin/fckeditor.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/geoipmaxmind.php
    M htdocs/admin/ihm.php
    M htdocs/admin/index.php
    M htdocs/admin/ldap.php
    M htdocs/admin/ldap_contacts.php
    M htdocs/admin/ldap_groups.php
    M htdocs/admin/ldap_members.php
    M htdocs/admin/ldap_users.php
    M htdocs/admin/limits.php
    M htdocs/admin/livraison.php
    M htdocs/admin/loan.php
    M htdocs/admin/mailing.php
    M htdocs/admin/mailman.php
    M htdocs/admin/mails.php
    M htdocs/admin/menus.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/menus/other.php
    M htdocs/admin/modules.php
    M htdocs/admin/notification.php
    M htdocs/admin/order_extrafields.php
    M htdocs/admin/orderdet_extrafields.php
    M htdocs/admin/pdf.php
    M htdocs/admin/perms.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/propal.php
    M htdocs/admin/proxy.php
    M htdocs/admin/salaries.php
    M htdocs/admin/security.php
    M htdocs/admin/security_file.php
    M htdocs/admin/security_other.php
    M htdocs/admin/sms.php
    M htdocs/admin/spip.php
    M htdocs/admin/stock.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/admin/supplierinvoice_extrafields.php
    M htdocs/admin/supplierinvoicedet_extrafields.php
    M htdocs/admin/supplierorder_extrafields.php
    M htdocs/admin/supplierorderdet_extrafields.php
    M htdocs/admin/syslog.php
    M htdocs/admin/system/about.php
    M htdocs/admin/system/browser.php
    M htdocs/admin/system/constall.php
    M htdocs/admin/system/database-tables.php
    M htdocs/admin/system/database.php
    M htdocs/admin/system/dbtable.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/admin/system/filecheck.php
    M htdocs/admin/system/index.php
    M htdocs/admin/system/modules.php
    M htdocs/admin/system/os.php
    M htdocs/admin/system/perf.php
    M htdocs/admin/system/phpinfo.php
    M htdocs/admin/system/web.php
    M htdocs/admin/system/xcache.php
    M htdocs/admin/system/xdebug.php
    M htdocs/admin/taxes.php
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/admin/tools/dolibarr_import.php
    M htdocs/admin/tools/eaccelerator.php
    M htdocs/admin/tools/export.php
    M htdocs/admin/tools/index.php
    M htdocs/admin/tools/purge.php
    M htdocs/admin/tools/update.php
    M htdocs/admin/translation.php
    M htdocs/admin/triggers.php
    M htdocs/admin/user.php
    M htdocs/admin/workflow.php
    M htdocs/bookmarks/admin/bookmark.php
    M htdocs/bookmarks/class/bookmark.class.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/admin/categorie.php
    M htdocs/categories/admin/categorie_extrafields.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/admin/askpricesupplier_extrafields.php
    M htdocs/comm/admin/askpricesupplierdet_extrafields.php
    M htdocs/comm/admin/propal_extrafields.php
    M htdocs/comm/admin/propaldet_extrafields.php
    M htdocs/comm/askpricesupplier/card.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/comm/list.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/propal/stats/index.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/commande/stats/index.php
    M htdocs/compta/bank/budget.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/categ.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/bank/rappro.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/admin/facture_cust_extrafields.php
    M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/index.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/paiement/list.php
    M htdocs/compta/paiement/rapport.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/stats/casoc.php
    M htdocs/compta/stats/index.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/admin/contract_extrafields.php
    M htdocs/contrat/admin/contractdet_extrafields.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/index.php
    M htdocs/contrat/list.php
    M htdocs/contrat/services.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/boxes/box_produits_alerte_stock.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/bank.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functionsnumtoword.lib.php
    M htdocs/core/lib/memory.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/ajax/fileupload_view.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/resource_view.tpl.php
    M htdocs/cron/admin/cron.php
    M htdocs/cron/card.php
    M htdocs/cron/list.php
    M htdocs/don/admin/donation.php
    M htdocs/don/admin/donation_extrafields.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/externalsite/admin/externalsite.php
    M htdocs/fichinter/admin/fichinter_extrafields.php
    M htdocs/fichinter/admin/fichinterdet_extrafields.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/list.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/list.php
    M htdocs/ftp/admin/ftpclient.php
    R htdocs/includes/nusoap/lib/Mail/PEAR.php
    R htdocs/includes/nusoap/lib/Mail/RFC822.php
    R htdocs/includes/nusoap/lib/Mail/mail.php
    M htdocs/includes/nusoap/lib/Mail/mime.php
    R htdocs/includes/nusoap/lib/Mail/mimeDecode.php
    M htdocs/includes/nusoap/lib/Mail/mimePart.php
    R htdocs/includes/nusoap/lib/Mail/null.php
    R htdocs/includes/nusoap/lib/Mail/sendmail.php
    R htdocs/includes/nusoap/lib/Mail/smtp.php
    R htdocs/includes/nusoap/lib/Mail/xmail.dtd
    R htdocs/includes/nusoap/lib/Mail/xmail.xsl
    M htdocs/index.php
    M htdocs/install/filelist.xml
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.key.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.sql
    M htdocs/install/mysql/tables/llx_livraison.sql
    A htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
    M htdocs/install/mysql/tables/llx_user.key.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/askpricesupplier.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/printing.lang
    M htdocs/langs/en_US/productbatch.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/en_US/trips.lang
    M htdocs/langs/en_US/workflow.lang
    M htdocs/livraison/card.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/margin/admin/margin.php
    M htdocs/opensurvey/card.php
    M htdocs/paybox/admin/paybox.php
    M htdocs/printing/admin/printing.php
    M htdocs/product/admin/product.php
    M htdocs/product/admin/product_extrafields.php
    M htdocs/product/admin/product_tools.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    A htdocs/product/class/propalmergepdfproduct.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/document.php
    M htdocs/product/index.php
    M htdocs/product/list.php
    M htdocs/product/popuprop.php
    M htdocs/product/stock/index.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/activity/index.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/admin/project_extrafields.php
    M htdocs/projet/admin/project_task_extrafields.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/ganttchart.inc.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/index.php
    M htdocs/projet/list.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/index.php
    M htdocs/resource/element_resource.php
    M htdocs/societe/admin/contact_extrafields.php
    M htdocs/societe/admin/societe.php
    M htdocs/societe/admin/societe_extrafields.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/societe/checkvat/checkVatPopup.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/consumption.php
    M htdocs/societe/index.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php
    A htdocs/theme/eldy/img/title_accountancy.png
    A htdocs/theme/eldy/img/title_bank.png
    A htdocs/theme/eldy/img/title_commercial.png
    A htdocs/theme/eldy/img/title_companies.png
    A htdocs/theme/eldy/img/title_generic.png
    A htdocs/theme/eldy/img/title_home.png
    A htdocs/theme/eldy/img/title_products.png
    A htdocs/theme/eldy/img/title_project.png
    A htdocs/theme/eldy/img/title_setup.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/admin/group_extrafields.php
    M htdocs/user/admin/user_extrafields.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M htdocs/webservices/admin/webservices.php
    M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
    M htdocs/webservices/demo_wsclient_category.php-NORUN
    M htdocs/webservices/demo_wsclient_invoice.php-NORUN
    M htdocs/webservices/demo_wsclient_other.php-NORUN
    M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
    M htdocs/webservices/server_thirdparty.php
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php
    M test/phpunit/AdherentTest.php
    M test/phpunit/AdminLibTest.php
    M test/phpunit/AllTests.php
    M test/phpunit/BuildDocTest.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/560fcb1b2475...94589b993514