[Dolibarr-git] [Dolibarr/dolibarr] bbed84: Merge branch 'develop' of add

dolibarr-git

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] bbed84: Merge branch 'develop' of add

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] bbed84: Merge branch 'develop' of address@hidden:Dolibarr/...
Date:	Sat, 18 Apr 2015 11:18:58 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bbed84991125b6d0e886202eff185bfded4c8031
      
https://github.com/Dolibarr/dolibarr/commit/bbed84991125b6d0e886202eff185bfded4c8031
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

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

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


  Commit: e15d4c045dc6094bc7b4cbdb33c190959a4d81b0
      
https://github.com/Dolibarr/dolibarr/commit/e15d4c045dc6094bc7b4cbdb33c190959a4d81b0
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    A htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/product/admin/product.php
    A htdocs/product/class/propalmergepdfproduct.class.php
    M htdocs/product/document.php

  Log Message:
  -----------
  NEW : Propal merge product card PDF into azur


  Commit: db2acb7ced36f361502bc7d84c1f102971a862d4
      
https://github.com/Dolibarr/dolibarr/commit/db2acb7ced36f361502bc7d84c1f102971a862d4
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M .editorconfig
    M COPYRIGHT
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/card.php
    M htdocs/admin/company.php
    M htdocs/admin/dict.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/stats/index.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/memory.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/expensereport/class/expensereport.class.php
    R htdocs/includes/nusoap/lib/Mail/PEAR.php
    R htdocs/includes/nusoap/lib/Mail/RFC822.php
    R htdocs/includes/nusoap/lib/Mail/mail.php
    M htdocs/includes/nusoap/lib/Mail/mime.php
    R htdocs/includes/nusoap/lib/Mail/mimeDecode.php
    M htdocs/includes/nusoap/lib/Mail/mimePart.php
    R htdocs/includes/nusoap/lib/Mail/null.php
    R htdocs/includes/nusoap/lib/Mail/sendmail.php
    R htdocs/includes/nusoap/lib/Mail/smtp.php
    R htdocs/includes/nusoap/lib/Mail/xmail.dtd
    R htdocs/includes/nusoap/lib/Mail/xmail.xsl
    M htdocs/livraison/card.php
    M htdocs/opensurvey/card.php
    M htdocs/product/composition/card.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/note.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
    M htdocs/webservices/demo_wsclient_category.php-NORUN
    M htdocs/webservices/demo_wsclient_invoice.php-NORUN
    M htdocs/webservices/demo_wsclient_other.php-NORUN
    M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php

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


  Commit: e704e03726be9bf079546a265e5417dac4666ec5
      
https://github.com/Dolibarr/dolibarr/commit/e704e03726be9bf079546a265e5417dac4666ec5
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/tpl/resource_view.tpl.php
    M htdocs/resource/element_resource.php

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


  Commit: 62ef9743ea4476ebac4143db02f011ad8b57f585
      
https://github.com/Dolibarr/dolibarr/commit/62ef9743ea4476ebac4143db02f011ad8b57f585
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M .editorconfig
    M COPYRIGHT
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/card.php
    M htdocs/admin/company.php
    M htdocs/admin/dict.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/stats/index.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/memory.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/resource_view.tpl.php
    M htdocs/expensereport/class/expensereport.class.php
    R htdocs/includes/nusoap/lib/Mail/PEAR.php
    R htdocs/includes/nusoap/lib/Mail/RFC822.php
    R htdocs/includes/nusoap/lib/Mail/mail.php
    M htdocs/includes/nusoap/lib/Mail/mime.php
    R htdocs/includes/nusoap/lib/Mail/mimeDecode.php
    M htdocs/includes/nusoap/lib/Mail/mimePart.php
    R htdocs/includes/nusoap/lib/Mail/null.php
    R htdocs/includes/nusoap/lib/Mail/sendmail.php
    R htdocs/includes/nusoap/lib/Mail/smtp.php
    R htdocs/includes/nusoap/lib/Mail/xmail.dtd
    R htdocs/includes/nusoap/lib/Mail/xmail.xsl
    M htdocs/livraison/card.php
    M htdocs/opensurvey/card.php
    M htdocs/product/composition/card.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/note.php
    M htdocs/resource/element_resource.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
    M htdocs/webservices/demo_wsclient_category.php-NORUN
    M htdocs/webservices/demo_wsclient_invoice.php-NORUN
    M htdocs/webservices/demo_wsclient_other.php-NORUN
    M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php

  Log Message:
  -----------
  Merge branch 'develop' into dev_pdfpropalmergeproductpdf


  Commit: f7b2b00ebd271e1821e3e4e29fd07461ec641224
      
https://github.com/Dolibarr/dolibarr/commit/f7b2b00ebd271e1821e3e4e29fd07461ec641224
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    A htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/product/admin/product.php
    A htdocs/product/class/propalmergepdfproduct.class.php
    M htdocs/product/document.php

  Log Message:
  -----------
  Merge pull request #2650 from FHenry/dev_pdfpropalmergeproductpdf

NEW : Propal merge PDF product attached files (on option)


Compare: 
https://github.com/Dolibarr/dolibarr/compare/cb0e45d54bb7...f7b2b00ebd27

[Prev in Thread]

Current Thread

[Next in Thread]

[Dolibarr-git] [Dolibarr/dolibarr] bbed84: Merge branch 'develop' of address@hidden:Dolibarr/..., Laurent Destailleur <=

Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] bbd01c: Fix: Bug #2577 Incorrect invoice status in "Linked...
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 25eeff: first commit to fix issue #2584 - checks for dupli...
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] bbd01c: Fix: Bug #2577 Incorrect invoice status in "Linked...
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 25eeff: first commit to fix issue #2584 - checks for dupli...
Index(es):
- Date
- Thread