[Dolibarr-git] [Dolibarr/dolibarr] 63220e: Presentation

[Laurent Destailleur]

  Branch: refs/heads/4.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 63220eae180f77da23f728ec8e5ccc787d3ab90e
      
https://github.com/Dolibarr/dolibarr/commit/63220eae180f77da23f728ec8e5ccc787d3ab90e
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Presentation


  Commit: 30ec33f1522b8e3f891d23991805832942b65f68
      
https://github.com/Dolibarr/dolibarr/commit/30ec33f1522b8e3f891d23991805832942b65f68
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/langs/en_US/main.lang

  Log Message:
  -----------
  Missing key language


  Commit: 26f98a2ab74d31e4a536af468e9b646844ba693f
      
https://github.com/Dolibarr/dolibarr/commit/26f98a2ab74d31e4a536af468e9b646844ba693f
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/expensereport/document.php
    M htdocs/holiday/card.php

  Log Message:
  -----------
  Presentation


  Commit: 3cdb2d45c203d7c2babd4c49d01f6abfa30c9a12
      
https://github.com/Dolibarr/dolibarr/commit/3cdb2d45c203d7c2babd4c49d01f6abfa30c9a12
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/contact.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/facture/note.php
    M htdocs/compta/facture/prelevement.php

  Log Message:
  -----------
  Uniformize presentation customer invoice


  Commit: 4ee4de4a0009a34fca9249f9896ed76cb7591c24
      
https://github.com/Dolibarr/dolibarr/commit/4ee4de4a0009a34fca9249f9896ed76cb7591c24
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/contact.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/info.php
    M htdocs/fourn/facture/note.php

  Log Message:
  -----------
  Uniformize presentation supplier invoice


  Commit: 4a0eb496faeba9a035b96a2baf01f5f4dce10e40
      
https://github.com/Dolibarr/dolibarr/commit/4a0eb496faeba9a035b96a2baf01f5f4dce10e40
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M build/doxygen/doxygen_footer.html
    M build/exe/doliwamp/dolibarr.conf.install
    M build/exe/doliwamp/doliwamp.iss
    M build/exe/doliwamp/httpd.conf.install
    M build/exe/doliwamp/phpmyadmin.conf.install
    M build/makepack-dolibarr.pl
    M dev/initdata/README
    R dev/initdemo/documents_demo/doctemplates/invoices/template_invoice.odt
    R dev/initdemo/documents_demo/doctemplates/orders/template_order.odt
    R dev/initdemo/documents_demo/doctemplates/projects/template_project.odt
    R dev/initdemo/documents_demo/doctemplates/proposals/template_proposal.odt
    R dev/initdemo/documents_demo/doctemplates/tasks/template_task_summary.odt
    R 
dev/initdemo/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
    A 
dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png
    A dev/initdemo/documents_demo/produit/DOLICLOUD/dolicloud_logo.png
    A 
dev/initdemo/documents_demo/produit/DOLICLOUD/thumbs/dolicloud_logo_mini.png
    A 
dev/initdemo/documents_demo/produit/DOLICLOUD/thumbs/dolicloud_logo_small.png
    A dev/initdemo/documents_demo/societe/contact/10/eldy_php.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/ldestailleur_200x200.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/thumbs/ldestailleur_200x200_mini.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/thumbs/ldestailleur_200x200_small.jpg
    A dev/initdemo/documents_demo/societe/contact/10/thumbs/eldy_php_mini.jpg
    A dev/initdemo/documents_demo/societe/contact/10/thumbs/eldy_php_small.jpg
    A dev/initdemo/documents_demo/supplier_proposal/RQ1607-0001/RQ1607-0001.pdf
    A dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
    A dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
    A dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg
    M dev/initdemo/initdemo.sh
    A dev/initdemo/mysqldump_dolibarr_4.0.0.sql
    M dev/initdemo/savedemo.sh
    A dev/initdemo/updatedemo.php
    M doc/images/dolibarr_screenshot10_1280x800.png
    M doc/images/dolibarr_screenshot2_1280x800.png
    M doc/images/dolibarr_screenshot4_1280x800.png
    M doc/images/dolibarr_screenshot5_1280x800.png
    A doc/images/dolibarr_screenshot6_1280x800.png
    M doc/images/dolibarr_screenshot7_1280x800.png
    M doc/images/dolibarr_screenshot8_1280x800.png
    M doc/images/dolibarr_screenshot9_1280x800.png
    R doc/images/dolimed.ico
    M doc/images/doliwampoff.ico
    M doc/images/doliwampon.ico
    M htdocs/admin/prelevement.php
    M htdocs/admin/security_file.php
    M htdocs/bookmarks/bookmarks.lib.php
    M htdocs/categories/index.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/contact/card.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/doxygen.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/modules/modOpenSurvey.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/docmine.php
    M htdocs/ecm/index.php
    M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/salaries.lang
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/public/demo/index.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/rib.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/list.php
    M htdocs/theme/eldy/ckeditor/config.js
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/ckeditor/config.js
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36

Conflicts:
        htdocs/societe/rib.php


  Commit: 0b7a5a4af93bda0df9b4334cb0205ca299d7de6b
      
https://github.com/Dolibarr/dolibarr/commit/0b7a5a4af93bda0df9b4334cb0205ca299d7de6b
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/don/card.php
    M htdocs/don/document.php
    M htdocs/don/info.php

  Log Message:
  -----------
  Uniformize presentation donation


  Commit: 8ce5fcd9800098885952e44464cd0a8da26b9233
      
https://github.com/Dolibarr/dolibarr/commit/8ce5fcd9800098885952e44464cd0a8da26b9233
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/compta/salaries/card.php
    M htdocs/compta/salaries/document.php
    M htdocs/compta/salaries/info.php

  Log Message:
  -----------
  Uniformize presentation salary payment


  Commit: 417dd6465cad77a44ca3fb63d28a935f9ea3eb36
      
https://github.com/Dolibarr/dolibarr/commit/417dd6465cad77a44ca3fb63d28a935f9ea3eb36
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/contact.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/facture/note.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/salaries/document.php
    M htdocs/compta/salaries/info.php
    M htdocs/don/card.php
    M htdocs/don/document.php
    M htdocs/don/info.php
    M htdocs/expensereport/document.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/contact.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/info.php
    M htdocs/fourn/facture/note.php
    M htdocs/holiday/card.php
    M htdocs/langs/en_US/main.lang
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Merge pull request #5570 from aspangaro/4.0-p36

Fix Presentation & uniformize code


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e0c232548e2d...417dd6465cad