[Dolibarr-git] [Dolibarr/dolibarr] 19bec6: Manual merge from 3.8 backported

[Laurent Destailleur]

  Branch: refs/heads/3.9
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 19bec6b0b393edd9d3a156260a528cf2d9aa86e7
      
https://github.com/Dolibarr/dolibarr/commit/19bec6b0b393edd9d3a156260a528cf2d9aa86e7
  Author: bobby <address@hidden>
  Date:   2016-01-14 (Thu, 14 Jan 2016)

  Changed paths:
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/bookkeeping/listbyyear.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php

  Log Message:
  -----------
  Manual merge from 3.8 backported


  Commit: cd8a59f35a0923f96e9cf27dc2b07c7b5588a853
      
https://github.com/Dolibarr/dolibarr/commit/cd8a59f35a0923f96e9cf27dc2b07c7b5588a853
  Author: bobby <address@hidden>
  Date:   2016-01-15 (Fri, 15 Jan 2016)

  Changed paths:
    M htdocs/comm/action/listactions.php
    M htdocs/core/class/commonobject.class.php

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


  Commit: 71a46567ac4bfef5a2a9aabc74422700928e84f8
      
https://github.com/Dolibarr/dolibarr/commit/71a46567ac4bfef5a2a9aabc74422700928e84f8
  Author: bobby <address@hidden>
  Date:   2016-01-15 (Fri, 15 Jan 2016)

  Changed paths:
    M htdocs/accountancy/bookkeeping/listbyyear.php

  Log Message:
  -----------
  DEV : Accounting module


  Commit: 57035ace24b7d4a66da0810b2bb041d6a38d11f6
      
https://github.com/Dolibarr/dolibarr/commit/57035ace24b7d4a66da0810b2bb041d6a38d11f6
  Author: bobby <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/core/boxes/box_graph_invoices_permonth.php
    M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/list.php

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


  Commit: 4dd56c52d2b4d3849a623195c387c061cebc9be4
      
https://github.com/Dolibarr/dolibarr/commit/4dd56c52d2b4d3849a623195c387c061cebc9be4
  Author: bobby <address@hidden>
  Date:   2016-01-23 (Sat, 23 Jan 2016)

  Changed paths:
    A dev/initdata/documents_demo/.htaccess
    A dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf
    A dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
    A dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
    A dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
    A dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
    A dev/initdata/documents_demo/custom/main.inc.php
    A dev/initdata/documents_demo/custom/master.inc.php
    A dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt
    A dev/initdata/documents_demo/doctemplates/orders/template_order.odt
    A dev/initdata/documents_demo/doctemplates/projects/template_project.odt
    A dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt
    A dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt
    A 
dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
    A dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
    A dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf
    A 
dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
    A 
dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
    A dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf
    A dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf
    A dev/initdata/documents_demo/facture/AV1212-0002/AV1212-0002.pdf
    A dev/initdata/documents_demo/facture/AV1303-0003/AV1303-0003.pdf
    A dev/initdata/documents_demo/facture/FA1007-0002/FA1007-0002.pdf
    A dev/initdata/documents_demo/facture/FA1107-0006/FA1107-0006.pdf
    A dev/initdata/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt
    A dev/initdata/documents_demo/facture/FA1108-0003/FA1108-0003.pdf
    A dev/initdata/documents_demo/facture/FA1108-0004/FA1108-0004.pdf
    A dev/initdata/documents_demo/facture/FA1108-0005/FA1108-0005.pdf
    A dev/initdata/documents_demo/facture/FA1108-0007/FA1108-0007.pdf
    A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009.pdf
    A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt
    A dev/initdata/documents_demo/facture/FA1212-0011/FA1212-0011.pdf
    A dev/initdata/documents_demo/facture/FA1212-0021/FA1212-0021.pdf
    A dev/initdata/documents_demo/facture/FA1212-0023/FA1212-0023.pdf
    A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015.pdf
    A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt
    A dev/initdata/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf
    A dev/initdata/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf
    A 
dev/initdata/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf
    A 
dev/initdata/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf
    A 
dev/initdata/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf
    A dev/initdata/documents_demo/fournisseur/facture/6/1/16/16.pdf
    A dev/initdata/documents_demo/fournisseur/facture/7/1/17/17.pdf
    A dev/initdata/documents_demo/mycompany/logos/mybigcompany.png
    A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png
    A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png
    A dev/initdata/documents_demo/produit/APPLEPIE/applepieproduct.jpg
    A 
dev/initdata/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg
    A dev/initdata/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg
    A 
dev/initdata/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg
    A dev/initdata/documents_demo/produit/COMP-XP4523/compxp4523product.jpg
    A 
dev/initdata/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg
    A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_114x114.png
    A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
    A 
dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
    A 
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
    A 
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
    A 
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
    A dev/initdata/documents_demo/produit/PEARPIE/pearpieproduct.jpg
    A dev/initdata/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg
    A dev/initdata/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg
    A 
dev/initdata/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg
    A dev/initdata/documents_demo/produit/ROLLUPABC/rolluproduct.jpg
    A dev/initdata/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg
    A dev/initdata/documents_demo/propale/PR1007-0001/PR1007-0001.pdf
    A dev/initdata/documents_demo/propale/PR1007-0002/PR1007-0002.pdf
    A dev/initdata/documents_demo/propale/PR1302-0005/PR1302-0005.pdf
    A dev/initdata/documents_demo/propale/PR1302-0006/PR1302-0006.pdf
    A dev/initdata/documents_demo/propale/PR1302-0007/PR1302-0007.pdf
    A dev/initdata/documents_demo/societe/1/logos/indiancompany.png
    A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png
    A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_small.png
    A dev/initdata/documents_demo/societe/10/logos/logo_nltechno_94x100.png
    A 
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png
    A 
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png
    A dev/initdata/documents_demo/societe/11/logos/comapnycorp1company.png
    A 
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png
    A 
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png
    A dev/initdata/documents_demo/societe/12/logos/pierrecurie.jpg
    A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
    A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
    A dev/initdata/documents_demo/societe/13/logos/companycorp2company.png
    A 
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png
    A 
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png
    A dev/initdata/documents_demo/societe/17/logos/bookkeepercompany.png
    A 
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png
    A 
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png
    A dev/initdata/documents_demo/societe/19/logos/magicfoodstore.png
    A 
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png
    A 
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png
    A dev/initdata/documents_demo/societe/2/logos/teclibcompany.png
    A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png
    A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png
    A dev/initdata/documents_demo/societe/25/logos/printcompany.png
    A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_mini.png
    A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_small.png
    A dev/initdata/documents_demo/societe/3/logos/spanishcompany.png
    A dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png
    A 
dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png
    A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png
    A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_small.png
    A dev/initdata/documents_demo/societe/4/logos/valeencompany.png
    A dev/initdata/documents_demo/societe/5/logos/nocountrycomp.png
    A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png
    A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png
    A dev/initdata/documents_demo/societe/6/logos/swisstouch.png
    A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png
    A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_small.png
    A dev/initdata/documents_demo/societe/7/logos/genericcustomer.png
    A 
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png
    A 
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png
    A dev/initdata/documents_demo/users/0/1/mariecurie.jpg
    A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
    A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
    A dev/initdata/documents_demo/users/1/0/IMG_0013.jpg
    A dev/initdata/documents_demo/users/1/0/alberteinstein.jpg
    A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
    A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
    A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
    A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
    A dev/initdata/documents_demo/users/2/0/daviddoe.png
    A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_mini.png
    A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_small.png
    A dev/initdata/documents_demo/users/3/0/pierrecurie.jpg
    A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
    A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
    A dev/initdata/documents_demo/users/8/1/ldestailleur_200x200.jpg
    A dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
    A 
dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
    R dev/initdata/img/alberteinstein.jpg
    R dev/initdata/img/bookkeepercompany.png
    R dev/initdata/img/johndoe.png
    R dev/initdata/img/mariecurie.jpg
    R dev/initdata/img/mybigcompany.png
    R dev/initdata/img/pierrecurie.jpg
    R dev/initdata/img/printcompany.png
    M dev/initdata/mysqldump_dolibarr_3.8.0.sql
    M htdocs/admin/delais.php
    M htdocs/admin/dict.php
    M htdocs/admin/tools/purge.php
    M htdocs/bookmarks/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/index.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/facture.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/expensereport/list.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/holiday/card.php
    M htdocs/holiday/list.php
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/sms.lang
    M htdocs/opensurvey/wizard/index.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php
    M htdocs/societe/index.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

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


  Commit: 50d2665b0e23a18ef7f2054916b1df86a447e46f
      
https://github.com/Dolibarr/dolibarr/commit/50d2665b0e23a18ef7f2054916b1df86a447e46f
  Author: bobby <address@hidden>
  Date:   2016-01-23 (Sat, 23 Jan 2016)

  Changed paths:
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php

  Log Message:
  -----------
  Fix travis


  Commit: c286c4c6eca91072d3d3142fba94f89f5a3ac8ba
      
https://github.com/Dolibarr/dolibarr/commit/c286c4c6eca91072d3d3142fba94f89f5a3ac8ba
  Author: bobby <address@hidden>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php

  Log Message:
  -----------
  Accoutancy update


  Commit: 71c407e670b0845042dbdb0f63b02e4104276774
      
https://github.com/Dolibarr/dolibarr/commit/71c407e670b0845042dbdb0f63b02e4104276774
  Author: bobby <address@hidden>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M htdocs/accountancy/admin/export.php

  Log Message:
  -----------
  add coala book keeping export


  Commit: 283412f48903663d3e7e88204f64dfd11f0cf0d5
      
https://github.com/Dolibarr/dolibarr/commit/283412f48903663d3e7e88204f64dfd11f0cf0d5
  Author: bobby <address@hidden>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    M htdocs/cashdesk/css/style.css
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/langs/en_US/projects.lang
    M htdocs/main.inc.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/tasks/time.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/img/object_billa.png
    M htdocs/theme/md/img/object_billd.png
    M htdocs/theme/md/img/object_billr.png
    M htdocs/theme/md/img/object_project.png
    M htdocs/theme/md/img/object_projectpub.png
    M htdocs/theme/md/style.css.php

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


  Commit: 6aa6c067fbef9dda32312bcc2f85b6661e9cd044
      
https://github.com/Dolibarr/dolibarr/commit/6aa6c067fbef9dda32312bcc2f85b6661e9cd044
  Author: bobby <address@hidden>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php

  Log Message:
  -----------
  fix travis


  Commit: e2d998957453123b8325c8930d768fa1b04a442f
      
https://github.com/Dolibarr/dolibarr/commit/e2d998957453123b8325c8930d768fa1b04a442f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-30 (Sat, 30 Jan 2016)

  Changed paths:
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/bookkeeping/listbyyear.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php

  Log Message:
  -----------
  Merge pull request #4518 from FHenry/3.9_compta

3.9 compta


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b162eb1bb0f9...e2d998957453