[Dolibarr-git] [Dolibarr/dolibarr] e3853a: Redundant code

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] e3853a: Redundant code

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] e3853a: Redundant code
Date:	Sun, 22 Mar 2015 04:47:07 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e3853a648f8fd3a475b5d49b8cb69c6e11402d44
      
https://github.com/Dolibarr/dolibarr/commit/e3853a648f8fd3a475b5d49b8cb69c6e11402d44
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M htdocs/margin/admin/margin.php
    M htdocs/projet/admin/project.php
    M htdocs/societe/admin/societe.php

  Log Message:
  -----------
  Redundant code


  Commit: f2fededd2c8c6e9d44946d543b086cc3f6763559
      
https://github.com/Dolibarr/dolibarr/commit/f2fededd2c8c6e9d44946d543b086cc3f6763559
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M htdocs/admin/security_file.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/main.inc.php
    M htdocs/opensurvey/card.php
    M htdocs/opensurvey/list.php
    M htdocs/opensurvey/public/studs.php
    M htdocs/opensurvey/results.php

  Log Message:
  -----------
  Drop usage of deprecated dol_htmlentities function


  Commit: f117b65a1773c652fe824182f7534981617f9834
      
https://github.com/Dolibarr/dolibarr/commit/f117b65a1773c652fe824182f7534981617f9834
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Removed silent operator for PHP 4 in function dol_html_entity_decode


  Commit: e6c8cac3815a89c6731195f9a5fe52ad59e5d270
      
https://github.com/Dolibarr/dolibarr/commit/e6c8cac3815a89c6731195f9a5fe52ad59e5d270
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M htdocs/admin/security_file.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/main.inc.php
    M htdocs/opensurvey/card.php
    M htdocs/opensurvey/list.php
    M htdocs/opensurvey/public/studs.php
    M htdocs/opensurvey/results.php

  Log Message:
  -----------
  Removed TODO and deprecated tag of dol_htmlentities and revert substitution 
commit


  Commit: 0170d409d331237fa761a0e99464cde9af1fefa2
      
https://github.com/Dolibarr/dolibarr/commit/0170d409d331237fa761a0e99464cde9af1fefa2
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M README-FR.md
    M README.md
    M dev/dolibarr_changes.txt
    M dev/skeletons/skeleton_class.class.php
    M htdocs/accountancy/journal/bankjournal.php
    R htdocs/accountancy/journal/cashjournal.php
    M htdocs/adherents/admin/adherent_extrafields.php
    M htdocs/adherents/admin/adherent_type_extrafields.php
    M htdocs/adherents/card.php
    M htdocs/adherents/type.php
    M htdocs/admin/agenda_extrafields.php
    M htdocs/admin/agenda_extsites.php
    M htdocs/admin/bank_extrafields.php
    M htdocs/admin/order_extrafields.php
    M htdocs/admin/orderdet_extrafields.php
    M htdocs/admin/pdf.php
    M htdocs/admin/stock.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/system/browser.php
    M htdocs/admin/system/constall.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/categories/admin/categorie_extrafields.php
    M htdocs/categories/card.php
    M htdocs/categories/edit.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/admin/propal_extrafields.php
    M htdocs/comm/admin/propaldet_extrafields.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/class/bankcateg.class.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.class.php
    M htdocs/compta/facture/class/paymentterm.class.php
    M htdocs/compta/hrm.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/contact/card.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
    A htdocs/core/actions_lineupdown.inc.php
    M htdocs/core/actions_setnotes.inc.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/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/db/pgsql.class.php
    A htdocs/core/js/timesheet.js
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/fourn.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/project.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/modFournisseur.class.php
    R htdocs/core/tpl/admin_extrafields.tpl.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    A htdocs/core/tpl/admin_extrafields_view.tpl.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
    M htdocs/cron/class/cronjob.class.php
    M htdocs/expensereport/list.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/filefunc.inc.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/dispatch.php
    M htdocs/fourn/facture/card.php
    M htdocs/includes/fpdfi/pdf_parser.php
    M htdocs/includes/tcpdf/CHANGELOG.TXT
    M htdocs/includes/tcpdf/README.TXT
    M htdocs/includes/tcpdf/composer.json
    M htdocs/includes/tcpdf/config/tcpdf_config.php
    A htdocs/includes/tcpdf/fonts/ae_fonts_2.0/COPYING
    A htdocs/includes/tcpdf/fonts/ae_fonts_2.0/ChangeLog
    A htdocs/includes/tcpdf/fonts/ae_fonts_2.0/README
    A htdocs/includes/tcpdf/fonts/aealarabiya.ctg.z
    A htdocs/includes/tcpdf/fonts/aealarabiya.php
    A htdocs/includes/tcpdf/fonts/aealarabiya.z
    A htdocs/includes/tcpdf/fonts/aefurat.ctg.z
    A htdocs/includes/tcpdf/fonts/aefurat.php
    A htdocs/includes/tcpdf/fonts/aefurat.z
    M htdocs/includes/tcpdf/fonts/cid0cs.php
    M htdocs/includes/tcpdf/fonts/cid0ct.php
    M htdocs/includes/tcpdf/fonts/cid0jp.php
    M htdocs/includes/tcpdf/fonts/cid0kr.php
    A htdocs/includes/tcpdf/fonts/courier.php
    A htdocs/includes/tcpdf/fonts/courierb.php
    A htdocs/includes/tcpdf/fonts/courierbi.php
    A htdocs/includes/tcpdf/fonts/courieri.php
    M htdocs/includes/tcpdf/fonts/dejavusans.php
    M htdocs/includes/tcpdf/fonts/dejavusansb.php
    M htdocs/includes/tcpdf/fonts/dejavusansbi.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusanscondensed.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusanscondensedb.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusanscondensedi.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansextralight.php
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    M htdocs/includes/tcpdf/fonts/dejavusansi.php
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansmono.php
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansmonob.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansmonobi.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansmonoi.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
    A htdocs/includes/tcpdf/fonts/dejavuserif.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavuserif.php
    A htdocs/includes/tcpdf/fonts/dejavuserif.z
    A htdocs/includes/tcpdf/fonts/dejavuserifb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavuserifb.php
    A htdocs/includes/tcpdf/fonts/dejavuserifb.z
    A htdocs/includes/tcpdf/fonts/dejavuserifbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavuserifbi.php
    A htdocs/includes/tcpdf/fonts/dejavuserifbi.z
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensed.php
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensed.z
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensedb.php
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensedbi.php
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensedi.php
    A htdocs/includes/tcpdf/fonts/dejavuserifcondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavuserifi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavuserifi.php
    A htdocs/includes/tcpdf/fonts/dejavuserifi.z
    M htdocs/includes/tcpdf/fonts/freefont-20120503/ChangeLog
    M htdocs/includes/tcpdf/fonts/freemono.php
    M htdocs/includes/tcpdf/fonts/freemonob.php
    M htdocs/includes/tcpdf/fonts/freemonobi.php
    M htdocs/includes/tcpdf/fonts/freemonoi.php
    A htdocs/includes/tcpdf/fonts/freesans.ctg.z
    A htdocs/includes/tcpdf/fonts/freesans.php
    A htdocs/includes/tcpdf/fonts/freesans.z
    A htdocs/includes/tcpdf/fonts/freesansb.ctg.z
    A htdocs/includes/tcpdf/fonts/freesansb.php
    A htdocs/includes/tcpdf/fonts/freesansb.z
    A htdocs/includes/tcpdf/fonts/freesansbi.ctg.z
    A htdocs/includes/tcpdf/fonts/freesansbi.php
    A htdocs/includes/tcpdf/fonts/freesansbi.z
    A htdocs/includes/tcpdf/fonts/freesansi.ctg.z
    A htdocs/includes/tcpdf/fonts/freesansi.php
    A htdocs/includes/tcpdf/fonts/freesansi.z
    A htdocs/includes/tcpdf/fonts/freeserif.ctg.z
    A htdocs/includes/tcpdf/fonts/freeserif.php
    A htdocs/includes/tcpdf/fonts/freeserif.z
    A htdocs/includes/tcpdf/fonts/freeserifb.ctg.z
    A htdocs/includes/tcpdf/fonts/freeserifb.php
    A htdocs/includes/tcpdf/fonts/freeserifb.z
    A htdocs/includes/tcpdf/fonts/freeserifbi.ctg.z
    A htdocs/includes/tcpdf/fonts/freeserifbi.php
    A htdocs/includes/tcpdf/fonts/freeserifbi.z
    A htdocs/includes/tcpdf/fonts/freeserifi.ctg.z
    A htdocs/includes/tcpdf/fonts/freeserifi.php
    A htdocs/includes/tcpdf/fonts/freeserifi.z
    A htdocs/includes/tcpdf/fonts/hysmyeongjostdmedium.php
    A htdocs/includes/tcpdf/fonts/kozgopromedium.php
    A htdocs/includes/tcpdf/fonts/kozminproregular.php
    A htdocs/includes/tcpdf/fonts/pdfacourier.php
    A htdocs/includes/tcpdf/fonts/pdfacourier.z
    A htdocs/includes/tcpdf/fonts/pdfacourierb.php
    A htdocs/includes/tcpdf/fonts/pdfacourierb.z
    A htdocs/includes/tcpdf/fonts/pdfacourierbi.php
    A htdocs/includes/tcpdf/fonts/pdfacourierbi.z
    A htdocs/includes/tcpdf/fonts/pdfacourieri.php
    A htdocs/includes/tcpdf/fonts/pdfacourieri.z
    A htdocs/includes/tcpdf/fonts/pdfahelvetica.php
    A htdocs/includes/tcpdf/fonts/pdfahelvetica.z
    A htdocs/includes/tcpdf/fonts/pdfahelveticab.php
    A htdocs/includes/tcpdf/fonts/pdfahelveticab.z
    A htdocs/includes/tcpdf/fonts/pdfahelveticabi.php
    A htdocs/includes/tcpdf/fonts/pdfahelveticabi.z
    A htdocs/includes/tcpdf/fonts/pdfahelveticai.php
    A htdocs/includes/tcpdf/fonts/pdfahelveticai.z
    A htdocs/includes/tcpdf/fonts/pdfasymbol.php
    A htdocs/includes/tcpdf/fonts/pdfasymbol.z
    A htdocs/includes/tcpdf/fonts/pdfatimes.php
    A htdocs/includes/tcpdf/fonts/pdfatimes.z
    A htdocs/includes/tcpdf/fonts/pdfatimesb.php
    A htdocs/includes/tcpdf/fonts/pdfatimesb.z
    A htdocs/includes/tcpdf/fonts/pdfatimesbi.php
    A htdocs/includes/tcpdf/fonts/pdfatimesbi.z
    A htdocs/includes/tcpdf/fonts/pdfatimesi.php
    A htdocs/includes/tcpdf/fonts/pdfatimesi.z
    A htdocs/includes/tcpdf/fonts/pdfazapfdingbats.php
    A htdocs/includes/tcpdf/fonts/pdfazapfdingbats.z
    A htdocs/includes/tcpdf/fonts/symbol.php
    A htdocs/includes/tcpdf/fonts/times.php
    A htdocs/includes/tcpdf/fonts/timesb.php
    A htdocs/includes/tcpdf/fonts/timesbi.php
    A htdocs/includes/tcpdf/fonts/timesi.php
    M htdocs/includes/tcpdf/include/barcodes/datamatrix.php
    M htdocs/includes/tcpdf/include/barcodes/pdf417.php
    M htdocs/includes/tcpdf/include/tcpdf_filters.php
    M htdocs/includes/tcpdf/include/tcpdf_fonts.php
    M htdocs/includes/tcpdf/include/tcpdf_images.php
    M htdocs/includes/tcpdf/include/tcpdf_static.php
    M htdocs/includes/tcpdf/tcpdf.php
    M htdocs/includes/tcpdf/tcpdf_autoconfig.php
    M htdocs/includes/tcpdf/tcpdf_barcodes_1d.php
    M htdocs/includes/tcpdf/tcpdf_parser.php
    A htdocs/includes/tcpdi/fpdf_tpl.php
    A htdocs/includes/tcpdi/tcpdi.php
    A htdocs/includes/tcpdi/tcpdi_parser.php
    M htdocs/install/check.php
    M htdocs/install/etape1.php
    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/migration/repair.sql
    M htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
    M htdocs/install/mysql/tables/llx_commandedet.sql
    M htdocs/install/mysql/tables/llx_facture_fourn_det.sql
    M htdocs/install/mysql/tables/llx_projet_task.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/es_ES/accountancy.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/agenda.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/es_ES/cron.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/productbatch.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/langs/es_ES/sendings.lang
    M htdocs/langs/es_ES/stocks.lang
    M htdocs/langs/es_ES/suppliers.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/langs/es_ES/workflow.lang
    M htdocs/main.inc.php
    M htdocs/opensurvey/card.php
    M htdocs/opensurvey/wizard/choix_date.php
    M htdocs/product/admin/product_extrafields.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/class/productbatch.class.php
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/lib/replenishment.lib.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/replenish.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/activity/index.php
    R htdocs/projet/activity/list.php
    A htdocs/projet/activity/perday.php
    A htdocs/projet/activity/pertime.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/class/task.class.php
    M htdocs/projet/element.php
    M htdocs/projet/index.php
    M htdocs/projet/tasks/index.php
    M htdocs/projet/tasks/task.php
    M htdocs/public/agenda/agendaexport.php
    M htdocs/public/members/new.php
    M htdocs/societe/admin/contact_extrafields.php
    M htdocs/societe/admin/societe_extrafields.php
    M htdocs/societe/soc.php
    M htdocs/user/admin/group_extrafields.php
    M htdocs/user/admin/user_extrafields.php
    M htdocs/user/card.php
    M htdocs/user/group/card.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
        htdocs/core/lib/functions.lib.php


  Commit: ad7242529111062f5873b234cba7354555c03863
      
https://github.com/Dolibarr/dolibarr/commit/ad7242529111062f5873b234cba7354555c03863
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commoninvoice.class.php

  Log Message:
  -----------
  Moved some variables from FactureLigne to CommonInvoiceLine


  Commit: c7919a8d08bded53a302c4635ee55de5e4c31c12
      
https://github.com/Dolibarr/dolibarr/commit/c7919a8d08bded53a302c4635ee55de5e4c31c12
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Removed duplicated code


  Commit: b0e728251a1ffa5b35b747d929ca4e76be74e40f
      
https://github.com/Dolibarr/dolibarr/commit/b0e728251a1ffa5b35b747d929ca4e76be74e40f
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/core/class/commonobjectline.class.php

  Log Message:
  -----------
  Every line has a $rowid property


  Commit: b69ce21e3e271e6691bc17d163b1295f99744e3e
      
https://github.com/Dolibarr/dolibarr/commit/b69ce21e3e271e6691bc17d163b1295f99744e3e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  Removed duplicated code


  Commit: 4c08d34bb5332d42678a37d482007faa436569d9
      
https://github.com/Dolibarr/dolibarr/commit/4c08d34bb5332d42678a37d482007faa436569d9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonobjectline.class.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/fichinter/class/fichinter.class.php

  Log Message:
  -----------
  Standardized $rowid as property


  Commit: b84cf4afac89ab6c5112c5edf94c3a4f85bcbfcf
      
https://github.com/Dolibarr/dolibarr/commit/b84cf4afac89ab6c5112c5edf94c3a4f85bcbfcf
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Renamed FactureFournisseurLine to SupplierInvoiceLine


  Commit: 47a151f1572509362b556772520648aa2253e4b3
      
https://github.com/Dolibarr/dolibarr/commit/47a151f1572509362b556772520648aa2253e4b3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Created supplier invoice line


  Commit: 174f1cb5f7607407ff60a8d52898d1ff0b369efe
      
https://github.com/Dolibarr/dolibarr/commit/174f1cb5f7607407ff60a8d52898d1ff0b369efe
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  Refactored supplier invoice line view to fit commonobjectline view


  Commit: f82df1e634e67db455dd21ea722739a6eabd9825
      
https://github.com/Dolibarr/dolibarr/commit/f82df1e634e67db455dd21ea722739a6eabd9825
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/core/class/commonorder.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Refactorred supplier order to match with objectline templates


  Commit: e1982c54d9cf64b7458717757f4453b4f6b0ec59
      
https://github.com/Dolibarr/dolibarr/commit/e1982c54d9cf64b7458717757f4453b4f6b0ec59
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/core/class/commonorder.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Moved duplicated code to common class


  Commit: 54b6b199c729bdf61211182e5e8962d12655b3e4
      
https://github.com/Dolibarr/dolibarr/commit/54b6b199c729bdf61211182e5e8962d12655b3e4
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/core/class/commonorder.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Documented missing properties and removed redundant documentation
(cherry picked from commit 6124f6a)


  Commit: a7741350fe7940b2574adff02d5966569042a794
      
https://github.com/Dolibarr/dolibarr/commit/a7741350fe7940b2574adff02d5966569042a794
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Revert unwanted change


  Commit: 7a2e60bb65c97acaf487669ef85348bcf070373b
      
https://github.com/Dolibarr/dolibarr/commit/7a2e60bb65c97acaf487669ef85348bcf070373b
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  No need to PHP < 5.3.0 compatibility


  Commit: 6ec8a38e4a8221677dd08f21dc08323db6cbb689
      
https://github.com/Dolibarr/dolibarr/commit/6ec8a38e4a8221677dd08f21dc08323db6cbb689
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Removed duplicated code


  Commit: f94f9d1e577efe74de767441fd3af62465d7feb9
      
https://github.com/Dolibarr/dolibarr/commit/f94f9d1e577efe74de767441fd3af62465d7feb9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Removed $permtoedit variable


  Commit: 2e68b51a107c9ad90c2d9fee5f9e5f33939b2caa
      
https://github.com/Dolibarr/dolibarr/commit/2e68b51a107c9ad90c2d9fee5f9e5f33939b2caa
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-15 (Sun, 15 Mar 2015)

  Changed paths:
    M CONTRIBUTING.md
    M ChangeLog
    M build/debian/changelog
    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/fixdosfiles.sh
    A htdocs/admin/askpricesupplier.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/security_file.php
    M htdocs/admin/system/filecheck.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/peruser.php
    A htdocs/comm/admin/askpricesupplier_extrafields.php
    A htdocs/comm/admin/askpricesupplierdet_extrafields.php
    A htdocs/comm/askpricesupplier/card.php
    A htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    A htdocs/comm/askpricesupplier/class/index.html
    A htdocs/comm/askpricesupplier/document.php
    A htdocs/comm/askpricesupplier/index.php
    A htdocs/comm/askpricesupplier/info.php
    A htdocs/comm/askpricesupplier/list.php
    A htdocs/comm/askpricesupplier/note.php
    A htdocs/comm/askpricesupplier/tpl/index.html
    A htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
    M htdocs/comm/card.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    R htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/bank/budget.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/categ.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/salaries/index.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/document.php
    A htdocs/core/actions_fetchobject.inc.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/cookie.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    A htdocs/core/class/html.formaskpricesupplier.class.php
    M htdocs/core/class/html.formbank.class.php
    M htdocs/core/class/html.formcron.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formmailing.class.php
    M htdocs/core/class/html.formorder.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/menu.class.php
    M htdocs/core/class/mobiledetect.class.php
    M htdocs/core/class/openid.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/datepicker.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    A htdocs/core/lib/askpricesupplier.lib.php
    M htdocs/core/lib/bank.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    A 
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
    A htdocs/core/modules/askpricesupplier/doc/index.html
    A htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
    A htdocs/core/modules/askpricesupplier/index.html
    A htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php
    A htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php
    A htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/mod_commande_saphir.php
    M htdocs/core/modules/commande/modules_commande.php
    M htdocs/core/modules/contract/mod_contract_magre.php
    M htdocs/core/modules/contract/modules_contract.php
    M htdocs/core/modules/dons/modules_don.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/expensereport/modules_expensereport.php
    M htdocs/core/modules/export/modules_export.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/facture/modules_facture.php
    M htdocs/core/modules/fichinter/mod_arctic.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/livraison/mod_livraison_saphir.php
    A htdocs/core/modules/modAskPriceSupplier.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modFacture.class.php
    A htdocs/core/modules/modIncoterm.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/mod_propale_saphir.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/notes.tpl.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
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/class/expeditionbatch.class.php
    M htdocs/expedition/shipment.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/product/list.php
    M htdocs/includes/tcpdi/fpdf_tpl.php
    A htdocs/install/doctemplates/askpricesupplier/index.html
    A htdocs/install/doctemplates/askpricesupplier/template_askpricesupplier.odt
    M htdocs/install/filelist.xml
    A htdocs/install/mysql/data/llx_c_incoterms.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    A htdocs/install/mysql/tables/llx_askpricesupplier.sql
    A htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql
    A htdocs/install/mysql/tables/llx_askpricesupplierdet.sql
    A htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql
    A htdocs/install/mysql/tables/llx_c_incoterms.key.sql
    A htdocs/install/mysql/tables/llx_c_incoterms.sql
    M htdocs/install/mysql/tables/llx_payment_salary.sql
    M htdocs/install/mysql/tables/llx_projet.sql
    M htdocs/install/mysql/tables/llx_projet_task_time.sql
    M htdocs/langs/en_US/admin.lang
    A htdocs/langs/en_US/askpricesupplier.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/salaries.lang
    M htdocs/langs/fr_FR/admin.lang
    A htdocs/langs/fr_FR/askpricesupplier.lang
    A htdocs/langs/fr_FR/incoterm.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/livraison/card.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/pertime.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/document.php
    M htdocs/projet/element.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/index.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/time.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    A htdocs/theme/eldy/img/object_askpricesupplier.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/card.php
    M htdocs/webservices/server_contact.php
    M test/phpunit/ProjectTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/develop' into develop


  Commit: bcdf3407c7c1d7bbb50090bc2bf3f2215c3d7ff3
      
https://github.com/Dolibarr/dolibarr/commit/bcdf3407c7c1d7bbb50090bc2bf3f2215c3d7ff3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-15 (Sun, 15 Mar 2015)

  Changed paths:
    M htdocs/includes/tcpdi/fpdf_tpl.php

  Log Message:
  -----------
  Fixed line endings


  Commit: efb9f7f4fd063cb749926527353c5d62fade8b3f
      
https://github.com/Dolibarr/dolibarr/commit/efb9f7f4fd063cb749926527353c5d62fade8b3f
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-15 (Sun, 15 Mar 2015)

  Changed paths:
    M CONTRIBUTING.md
    M ChangeLog
    M build/debian/changelog
    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/fixdosfiles.sh
    A htdocs/admin/askpricesupplier.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/security_file.php
    M htdocs/admin/system/filecheck.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/peruser.php
    A htdocs/comm/admin/askpricesupplier_extrafields.php
    A htdocs/comm/admin/askpricesupplierdet_extrafields.php
    A htdocs/comm/askpricesupplier/card.php
    A htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    A htdocs/comm/askpricesupplier/class/index.html
    A htdocs/comm/askpricesupplier/document.php
    A htdocs/comm/askpricesupplier/index.php
    A htdocs/comm/askpricesupplier/info.php
    A htdocs/comm/askpricesupplier/list.php
    A htdocs/comm/askpricesupplier/note.php
    A htdocs/comm/askpricesupplier/tpl/index.html
    A htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
    M htdocs/comm/card.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    R htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/bank/budget.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/categ.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/salaries/index.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/document.php
    A htdocs/core/actions_fetchobject.inc.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/cookie.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    A htdocs/core/class/html.formaskpricesupplier.class.php
    M htdocs/core/class/html.formbank.class.php
    M htdocs/core/class/html.formcron.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formmailing.class.php
    M htdocs/core/class/html.formorder.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/menu.class.php
    M htdocs/core/class/mobiledetect.class.php
    M htdocs/core/class/openid.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/datepicker.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    A htdocs/core/lib/askpricesupplier.lib.php
    M htdocs/core/lib/bank.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    A 
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
    A htdocs/core/modules/askpricesupplier/doc/index.html
    A htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
    A htdocs/core/modules/askpricesupplier/index.html
    A htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php
    A htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php
    A htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/mod_commande_saphir.php
    M htdocs/core/modules/commande/modules_commande.php
    M htdocs/core/modules/contract/mod_contract_magre.php
    M htdocs/core/modules/contract/modules_contract.php
    M htdocs/core/modules/dons/modules_don.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/expensereport/modules_expensereport.php
    M htdocs/core/modules/export/modules_export.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/facture/modules_facture.php
    M htdocs/core/modules/fichinter/mod_arctic.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/livraison/mod_livraison_saphir.php
    A htdocs/core/modules/modAskPriceSupplier.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modFacture.class.php
    A htdocs/core/modules/modIncoterm.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/mod_propale_saphir.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/notes.tpl.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
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/class/expeditionbatch.class.php
    M htdocs/expedition/shipment.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/product/list.php
    M htdocs/includes/tcpdi/fpdf_tpl.php
    A htdocs/install/doctemplates/askpricesupplier/index.html
    A htdocs/install/doctemplates/askpricesupplier/template_askpricesupplier.odt
    M htdocs/install/filelist.xml
    A htdocs/install/mysql/data/llx_c_incoterms.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    A htdocs/install/mysql/tables/llx_askpricesupplier.sql
    A htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql
    A htdocs/install/mysql/tables/llx_askpricesupplierdet.sql
    A htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql
    A htdocs/install/mysql/tables/llx_c_incoterms.key.sql
    A htdocs/install/mysql/tables/llx_c_incoterms.sql
    M htdocs/install/mysql/tables/llx_payment_salary.sql
    M htdocs/install/mysql/tables/llx_projet.sql
    M htdocs/install/mysql/tables/llx_projet_task_time.sql
    M htdocs/langs/en_US/admin.lang
    A htdocs/langs/en_US/askpricesupplier.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/salaries.lang
    M htdocs/langs/fr_FR/admin.lang
    A htdocs/langs/fr_FR/askpricesupplier.lang
    A htdocs/langs/fr_FR/incoterm.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/livraison/card.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/main.inc.php
    M htdocs/margin/admin/margin.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/pertime.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/document.php
    M htdocs/projet/element.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/index.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/time.php
    M htdocs/societe/admin/societe.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    A htdocs/theme/eldy/img/object_askpricesupplier.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/card.php
    M htdocs/webservices/server_contact.php
    M test/phpunit/ProjectTest.php

  Log Message:
  -----------
  Merge branch 'develop' into refactor-1

Conflicts:
        htdocs/fourn/class/fournisseur.commande.class.php
        htdocs/includes/tcpdi/fpdf_tpl.php


  Commit: 086e439543e13e2ee53f6dd9341d158fcf0ba511
      
https://github.com/Dolibarr/dolibarr/commit/086e439543e13e2ee53f6dd9341d158fcf0ba511
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-15 (Sun, 15 Mar 2015)

  Changed paths:
    M .travis.yml
    M ChangeLog
    R dev/deduplicatefilelinesrecursively.sh
    A dev/fixaltlanguages.sh
    M dev/fixdosfiles.sh
    M dev/fixduplicatelangkey.sh
    A dev/fixduplicatelines.sh
    M dev/fixperms.sh
    M dev/fixutf8bomfiles.sh
    M dev/translation/strip_language_file.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/dict.php
    M htdocs/admin/menus/other.php
    M htdocs/admin/perms.php
    M htdocs/admin/system/database-tables.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/admin/tools/update.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/comm/propal.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/hrm.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/sociales/charges.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    A htdocs/conf/phpinfo.php
    M htdocs/contrat/card.php
    A htdocs/contrat/class/index.html
    M htdocs/core/actions_extrafields.inc.php
    R htdocs/core/class/WorkboardResponse.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/dolgraph.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/hookmanager.class.php
    A htdocs/core/class/workboardresponse.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/db/sqlite.class.php
    A htdocs/core/db/sqlite3.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/modAskPriceSupplier.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modContrat.class.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/extrafields_view.tpl.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
    A htdocs/expensereport/ajax/index.html
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/class/expensereportstats.class.php
    A htdocs/expensereport/class/index.html
    M htdocs/expensereport/export_csv.php
    A htdocs/expensereport/index.html
    M htdocs/expensereport/index.php
    M htdocs/expensereport/list.php
    A htdocs/expensereport/stats/index.html
    M htdocs/expensereport/synchro_compta.php
    M htdocs/fourn/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/list.php
    M htdocs/index.php
    M htdocs/install/etape1.php
    M htdocs/install/etape2.php
    M htdocs/install/fileconf.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_commande.sql
    M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
    M htdocs/install/mysql/tables/llx_expensereport.sql
    M htdocs/install/mysql/tables/llx_extrafields.sql
    M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
    M htdocs/install/mysql/tables/llx_projet_task_time.sql
    M htdocs/install/mysql/tables/llx_societe_extrafields.key.sql
    A htdocs/install/sqlite3/functions/functions.sql
    A htdocs/install/sqlite3/index.html
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/contracts.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/es_AR/admin.lang
    M htdocs/langs/es_CL/admin.lang
    M htdocs/langs/es_DO/admin.lang
    M htdocs/langs/es_HN/admin.lang
    M htdocs/langs/es_MX/admin.lang
    M htdocs/langs/es_PE/admin.lang
    M htdocs/langs/es_PR/admin.lang
    M htdocs/langs/pt_BR/accountancy.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/boxes.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/compta.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/install.lang
    M htdocs/langs/pt_BR/languages.lang
    M htdocs/langs/pt_BR/mails.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/resource.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/stock/replenish.php
    M htdocs/projet/element.php
    M htdocs/societe/agenda.php
    M htdocs/societe/class/companybankaccount.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/consumption.php
    M htdocs/societe/document.php
    M htdocs/societe/info.php
    M htdocs/societe/notify/card.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/ckeditor/config.js
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Merge branch 'develop' into refactor-1

Conflicts:
        htdocs/core/tpl/objectline_view.tpl.php


  Commit: 6ba3b900b7aed1b8298c4f287b73c694d2a876f1
      
https://github.com/Dolibarr/dolibarr/commit/6ba3b900b7aed1b8298c4f287b73c694d2a876f1
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-03-15 (Sun, 15 Mar 2015)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  PHPCS Fix


  Commit: a79a779b04ebcfea2713652a8ca2c10d8eedbeaa
      
https://github.com/Dolibarr/dolibarr/commit/a79a779b04ebcfea2713652a8ca2c10d8eedbeaa
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonobjectline.class.php
    M htdocs/core/class/commonorder.class.php
    M htdocs/core/lib/functions.lib.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
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/margin/admin/margin.php
    M htdocs/projet/admin/project.php
    M htdocs/societe/admin/societe.php

  Log Message:
  -----------
  Merge pull request #2456 from marcosgdf/refactor-1

Refactor 1


Compare: 
https://github.com/Dolibarr/dolibarr/compare/eb7f2f464ea6...a79a779b04eb
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] e3853a: Redundant code, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] fc5899: Relocation of expression files
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 2d9025: Revert "Refactor 1"
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] fc5899: Relocation of expression files
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 2d9025: Revert "Refactor 1"
Index(es):
- Date
- Thread