dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] b81314: NEW generation ODT

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] b81314: NEW generation ODT
Date: Tue, 14 Mar 2017 02:44:26 -0700 
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b813144edb102c4c9b13407836042eae220761dd
      
https://github.com/Dolibarr/dolibarr/commit/b813144edb102c4c9b13407836042eae220761dd
  Author: arnaud <address@hidden>
  Date:   2017-01-06 (Fri, 06 Jan 2017)

  Changed paths:
    M htdocs/admin/user.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/product/modules_product.class.php
    A htdocs/core/modules/user/modules_user.class.php
    M htdocs/product/admin/product.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/user/card.php

  Log Message:
  -----------
  NEW generation ODT


  Commit: abeba95de9740d1cecaed4f872ff799326e15c13
      
https://github.com/Dolibarr/dolibarr/commit/abeba95de9740d1cecaed4f872ff799326e15c13
  Author: arnaud <address@hidden>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M htdocs/admin/user.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  New USER odt


  Commit: cff9fa0e6b4f4c13909f703f2cd646336cd48437
      
https://github.com/Dolibarr/dolibarr/commit/cff9fa0e6b4f4c13909f703f2cd646336cd48437
  Author: arnaud <address@hidden>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/modules/user/modules_user.class.php

  Log Message:
  -----------
  FIX user odt


  Commit: 4a7e3fb3872d0e85613227f5d1b454cae5c5a0a8
      
https://github.com/Dolibarr/dolibarr/commit/4a7e3fb3872d0e85613227f5d1b454cae5c5a0a8
  Author: arnaud <address@hidden>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    A htdocs/admin/usergroup.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/user/modules_user.class.php
    A htdocs/core/modules/usergroup/modules_usergroup.class.php
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/install/mysql/tables/llx_usergroup.sql
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/group/card.php

  Log Message:
  -----------
  NEW odt usergroup


  Commit: 1d31603ad23084eb2d512ce92410ba9061d69afb
      
https://github.com/Dolibarr/dolibarr/commit/1d31603ad23084eb2d512ce92410ba9061d69afb
  Author: arnaud <address@hidden>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M ChangeLog
    M htdocs/comm/remx.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/categ.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/product/mod_codeproduct_elephant.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/expensereport/class/paymentexpensereport.class.php
    M htdocs/filefunc.inc.php
    M htdocs/margin/agentMargins.php

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


  Commit: a796a321cc7c97e71691dfd23499d9b9ca1ac9d0
      
https://github.com/Dolibarr/dolibarr/commit/a796a321cc7c97e71691dfd23499d9b9ca1ac9d0
  Author: arnaud <address@hidden>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M htdocs/admin/user.php
    A htdocs/admin/usergroup.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/lib/admin.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/product/modules_product.class.php
    A htdocs/core/modules/user/modules_user.class.php
    A htdocs/core/modules/usergroup/modules_usergroup.class.php
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/install/mysql/tables/llx_usergroup.sql
    M htdocs/product/class/product.class.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/group/card.php

  Log Message:
  -----------
  Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into 
NEW_odt_others_objects

Conflicts:
        htdocs/core/class/html.formfile.class.php
        htdocs/product/admin/product.php
        htdocs/product/card.php


  Commit: 192a825de8548ed7cbbbafbb4cc0f841c60527f7
      
https://github.com/Dolibarr/dolibarr/commit/192a825de8548ed7cbbbafbb4cc0f841c60527f7
  Author: arnaud <address@hidden>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M htdocs/core/actions_builddoc.inc.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/functions2.lib.php
    A htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    A htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
    A htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
    A htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
    M htdocs/core/modules/usergroup/modules_usergroup.class.php
    A htdocs/install/doctemplates/contracts/index.html
    A htdocs/install/doctemplates/contracts/template_contract.odt
    A htdocs/install/doctemplates/products/index.html
    A htdocs/install/doctemplates/products/template_product.odt
    A htdocs/install/doctemplates/usergroups/index.html
    A htdocs/install/doctemplates/usergroups/template_usergroup.odt
    A htdocs/install/doctemplates/users/index.html
    A htdocs/install/doctemplates/users/template_user.odt
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/step1.php
    M htdocs/product/admin/product.php
    M htdocs/product/card.php
    M htdocs/user/group/card.php

  Log Message:
  -----------
  NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class


  Commit: 3ab7bac511ddf748356e27e058a79657ad5bb955
      
https://github.com/Dolibarr/dolibarr/commit/3ab7bac511ddf748356e27e058a79657ad5bb955
  Author: arnaud <address@hidden>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M htdocs/install/mysql/data/llx_const.sql

  Log Message:
  -----------
  FIX fresh install const


  Commit: d951114c18d20b45b1076817a68fcf3c09caade4
      
https://github.com/Dolibarr/dolibarr/commit/d951114c18d20b45b1076817a68fcf3c09caade4
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M .github/CONTRIBUTING.md
    M README.md
    M htdocs/accountancy/admin/index.php
    M htdocs/admin/index.php
    M htdocs/admin/modules.php
    M htdocs/comm/action/index.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/remise.php
    M htdocs/compta/sociales/card.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/core/ajax/box.php
    M htdocs/core/boxes/box_actions.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/boxes/box_bookmarks.php
    M htdocs/core/boxes/box_clients.php
    M htdocs/core/boxes/box_commandes.php
    M htdocs/core/boxes/box_comptes.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/boxes/box_contracts.php
    M htdocs/core/boxes/box_external_rss.php
    M htdocs/core/boxes/box_factures.php
    M htdocs/core/boxes/box_factures_fourn.php
    M htdocs/core/boxes/box_factures_fourn_imp.php
    M htdocs/core/boxes/box_factures_imp.php
    M htdocs/core/boxes/box_ficheinter.php
    M htdocs/core/boxes/box_fournisseurs.php
    M htdocs/core/boxes/box_goodcustomers.php
    M htdocs/core/boxes/box_graph_invoices_permonth.php
    M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
    M htdocs/core/boxes/box_graph_orders_permonth.php
    M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
    M htdocs/core/boxes/box_graph_propales_permonth.php
    M htdocs/core/boxes/box_members.php
    M htdocs/core/boxes/box_produits.php
    M htdocs/core/boxes/box_produits_alerte_stock.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/boxes/box_propales.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/boxes/box_services_contracts.php
    M htdocs/core/boxes/box_services_expired.php
    M htdocs/core/boxes/box_supplier_orders.php
    M htdocs/core/boxes/box_task.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/db/Database.interface.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/login/functions_dolibarr.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/modDon.class.php
    M htdocs/core/modules/modNotification.class.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/resource_add.tpl.php
    M htdocs/don/class/don.class.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/index.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_chargesociales.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/loan.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/class/productlot.class.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/productlot_card.php
    M htdocs/product/stock/replenish.php
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/product/stock/tpl/stocktransfer.tpl.php
    M htdocs/product/traduction.php
    M htdocs/projet/card.php
    M htdocs/projet/element.php
    M htdocs/projet/list.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/societe/tpl/linesalesrepresentative.tpl.php
    M htdocs/theme/eldy/img/object_bookmark.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/img/object_bookmark.png
    M htdocs/theme/md/style.css.php
    M htdocs/variants/combinations.php

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


  Commit: ebe552ead58509cdc53fadcc929aa1dc2c94d2ea
      
https://github.com/Dolibarr/dolibarr/commit/ebe552ead58509cdc53fadcc929aa1dc2c94d2ea
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M htdocs/admin/user.php
    A htdocs/admin/usergroup.php
    M htdocs/core/actions_builddoc.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/html.formfile.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/usergroups.lib.php
    A htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    A htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
    M htdocs/core/modules/product/modules_product.class.php
    A htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
    A htdocs/core/modules/user/modules_user.class.php
    A htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
    A htdocs/core/modules/usergroup/modules_usergroup.class.php
    A htdocs/install/doctemplates/contracts/index.html
    A htdocs/install/doctemplates/contracts/template_contract.odt
    A htdocs/install/doctemplates/products/index.html
    A htdocs/install/doctemplates/products/template_product.odt
    A htdocs/install/doctemplates/usergroups/index.html
    A htdocs/install/doctemplates/usergroups/template_usergroup.odt
    A htdocs/install/doctemplates/users/index.html
    A htdocs/install/doctemplates/users/template_user.odt
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/install/mysql/tables/llx_usergroup.sql
    M htdocs/install/step1.php
    M htdocs/product/admin/product.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/group/card.php

  Log Message:
  -----------
  Merge pull request #6521 from atm-arnaud/NEW_odt_others_objects

NEW odt generation possible for contract, product, user and user groups


Compare: 
https://github.com/Dolibarr/dolibarr/compare/70db9400ad65...ebe552ead585
reply via email to
[Prev in Thread] Current Thread [Next in Thread]