[Dolibarr-git] [Dolibarr/dolibarr] b43d4b: NEW : Add __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUM...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b43d4bba68bded0d6f5c5eaaacca7fb950f14ab5
      
https://github.com/Dolibarr/dolibarr/commit/b43d4bba68bded0d6f5c5eaaacca7fb950f14ab5
  Author: florian HENRY <address@hidden>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M htdocs/expedition/card.php

  Log Message:
  -----------
  NEW : Add __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUMURL__ into shipping
mail template


  Commit: ad7bece2489507a75fe97e4e7a4ef2406ab7ce38
      
https://github.com/Dolibarr/dolibarr/commit/ad7bece2489507a75fe97e4e7a4ef2406ab7ce38
  Author: florian HENRY <address@hidden>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M build/pad/DoliWamp.pml
    M build/pad/Dolibarr.pml
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml

  Log Message:
  -----------
  merge file


  Commit: e8f9a558b3737d6863a91f3885be824cbcf61350
      
https://github.com/Dolibarr/dolibarr/commit/e8f9a558b3737d6863a91f3885be824cbcf61350
  Author: florian HENRY <address@hidden>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M .tx/config
    M COPYRIGHT
    M ChangeLog
    M build/exe/doliwamp/Languages/MyFrench.isl
    M build/exe/doliwamp/dolibarr.conf.install
    M build/exe/doliwamp/doliwamp.bmp
    M build/exe/doliwamp/doliwamp.iss
    M build/exe/doliwamp/doliwampsmall.bmp
    M build/exe/doliwamp/httpd.conf.install
    M build/exe/doliwamp/install_services.bat.install
    M build/exe/doliwamp/my.ini.install
    M build/exe/doliwamp/phpmyadmin.conf.install
    M build/exe/doliwamp/startdoliwamp.bat
    M build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install
    M build/exe/doliwamp/stopdoliwamp.bat
    M build/exe/doliwamp/uninstall_services.bat.install
    M build/makepack-dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M dev/security/htaccess.txt
    M dev/skeletons/modMyModule.class.php
    M dev/translation/sanity_check_en_langfiles.php
    M htdocs/accountancy/admin/categories.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/accountancycategory.class.php
    M htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/report/result.php
    M htdocs/adherents/card.php
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/cotisation.class.php
    M htdocs/adherents/fiche_subscription.php
    A htdocs/adherents/tpl/index.html
    A htdocs/adherents/tpl/linkedobjectblock.tpl.php
    M htdocs/admin/company.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/tools/export.php
    M htdocs/cashdesk/include/environnement.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/class/ical.class.php
    M htdocs/comm/index.php
    M htdocs/comm/mailing/advtargetemailing.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/remx.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/annuel.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/facture.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/prelevement.php
    M htdocs/compta/index.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/conf/conf.php.example
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/actions_builddoc.inc.php
    M htdocs/core/actions_printing.inc.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/ajax/selectsearchbox.php
    M htdocs/core/boxes/box_actions.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/boxes/box_bookmarks.php
    M htdocs/core/boxes/box_clients.php
    M htdocs/core/boxes/box_commandes.php
    M htdocs/core/boxes/box_comptes.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/boxes/box_contracts.php
    M htdocs/core/boxes/box_external_rss.php
    M htdocs/core/boxes/box_factures.php
    M htdocs/core/boxes/box_factures_fourn.php
    M htdocs/core/boxes/box_factures_fourn_imp.php
    M htdocs/core/boxes/box_factures_imp.php
    M htdocs/core/boxes/box_ficheinter.php
    M htdocs/core/boxes/box_fournisseurs.php
    M htdocs/core/boxes/box_goodcustomers.php
    M htdocs/core/boxes/box_graph_invoices_permonth.php
    M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
    M htdocs/core/boxes/box_graph_orders_permonth.php
    M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
    M htdocs/core/boxes/box_graph_product_distribution.php
    M htdocs/core/boxes/box_graph_propales_permonth.php
    M htdocs/core/boxes/box_members.php
    M htdocs/core/boxes/box_produits.php
    M htdocs/core/boxes/box_produits_alerte_stock.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/boxes/box_propales.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/boxes/box_services_contracts.php
    M htdocs/core/boxes/box_services_expired.php
    M htdocs/core/boxes/box_supplier_orders.php
    M htdocs/core/boxes/box_task.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formadmin.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formcontract.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/interfaces.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/filemanagerdol/browser/default/browser.php
    M htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
    M htdocs/core/filemanagerdol/browser/default/frmupload.php
    M htdocs/core/filemanagerdol/connectors/php/commands.php
    M htdocs/core/lib/emailing.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/prelevement.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/mailings/advthirdparties.modules.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/core/modules/modCron.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modSupplierProposal.class.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.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/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/don/card.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/list.php
    M htdocs/exports/class/export.class.php
    M htdocs/exports/export.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.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/list.php
    M htdocs/holiday/view_log.php
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
    M htdocs/install/mysql/data/llx_accounting_category.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/install/step1.php
    M htdocs/install/step5.php
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/interventions.lang
    M htdocs/langs/en_US/languages.lang
    M htdocs/langs/en_US/link.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/printing.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/interventions.lang
    M htdocs/langs/fr_FR/languages.lang
    M htdocs/langs/fr_FR/loan.lang
    M htdocs/langs/fr_FR/oauth.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/main.inc.php
    M htdocs/multicurrency/class/multicurrency.class.php
    M htdocs/product/card.php
    M htdocs/product/stats/card.php
    M htdocs/product/stock/product.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/list.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/demo/index.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/consumption.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/theme/eldy/img/object_trip.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/userbankaccount.class.php
    M htdocs/user/group/perms.php
    M htdocs/user/index.php
    M htdocs/viewimage.php
    M htdocs/websites/index.php
    M scripts/cron/cron_run_jobs.php
    M scripts/product/migrate_picture_path.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/PgsqlTest.php

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


  Commit: f0c80bf78b6ac4bff3b1f1965850f602733414ad
      
https://github.com/Dolibarr/dolibarr/commit/f0c80bf78b6ac4bff3b1f1965850f602733414ad
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-15 (Fri, 15 Jul 2016)

  Changed paths:
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Merge pull request #5388 from atm-florian/dev_new_ship_tag_mail

NEW : Add __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUMURL__ into shipping


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1b070babc856...f0c80bf78b6a