[Dolibarr-git] [Dolibarr/dolibarr] f45d9b: REVERT THIS

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f45d9b3b4cae96e4d11ddb0612092ffe0abd6268
      
https://github.com/Dolibarr/dolibarr/commit/f45d9b3b4cae96e4d11ddb0612092ffe0abd6268
  Author: phf <address@hidden>
  Date:   2016-07-22 (Fri, 22 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
    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

  Log Message:
  -----------
  REVERT THIS


  Commit: 92863b1081f77ca57f76c612f42402cf9bd2a113
      
https://github.com/Dolibarr/dolibarr/commit/92863b1081f77ca57f76c612f42402cf9bd2a113
  Author: phf <address@hidden>
  Date:   2016-07-26 (Tue, 26 Jul 2016)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.formprojet.class.php

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


  Commit: e4ded184773cb744fa4fdbb077cf8ea85b670292
      
https://github.com/Dolibarr/dolibarr/commit/e4ded184773cb744fa4fdbb077cf8ea85b670292
  Author: phf <address@hidden>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    M htdocs/admin/ihm.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/index.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/localtax/index.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/fiche-stat.php
    M htdocs/contact/list.php
    M htdocs/contrat/list.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/doleditor.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/filemanagerdol/connectors/php/config.php
    M htdocs/core/js/lib_head.js.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/barcode/mod_barcode_product_standard.php
    M htdocs/core/modules/barcode/modules_barcode.class.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modProductBatch.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/don/card.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/list.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/commande/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/product/admin/product.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/product.php
    M htdocs/resource/class/resource.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/list.php
    M htdocs/societe/soc.php
    M htdocs/supplier_proposal/list.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/viewimage.php
    M htdocs/webservices/server_contact.php
    M htdocs/webservices/server_order.php
    M test/phpunit/Functions2LibTest.php

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


  Commit: 7376170f01c5ddfb9517aebbcebb5f53913effbb
      
https://github.com/Dolibarr/dolibarr/commit/7376170f01c5ddfb9517aebbcebb5f53913effbb
  Author: phf <address@hidden>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M htdocs/compta/localtax/clients.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/extrafieldsinexport.inc.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/societe/consumption.php

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


  Commit: 21a648a052cc1d6b0e83a9957b115dc7a217e5c8
      
https://github.com/Dolibarr/dolibarr/commit/21a648a052cc1d6b0e83a9957b115dc7a217e5c8
  Author: phf <address@hidden>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  Fix user right on margin module to write buyprice


  Commit: cca796714458ca7dbc9a1ef1833c3eecca328318
      
https://github.com/Dolibarr/dolibarr/commit/cca796714458ca7dbc9a1ef1833c3eecca328318
  Author: phf <address@hidden>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  Merge branch 'fix_user_right_write_margin' into 
fix_develop_user_right_write_margin


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

  Changed paths:
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin

Fix user right write margin


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8d9ec4f7551f...12e919b99dd9