[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 96f16b: Update commondocgenerator.cla
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 96f16b: Update commondocgenerator.class.php |
|
Date: |
Mon, 27 Aug 2018 17:37:24 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 96f16b74975b2b7730056012ff54ffa58e7e74ef
https://github.com/Dolibarr/dolibarr/commit/96f16b74975b2b7730056012ff54ffa58e7e74ef
Author: Frédéric FRANCE <address@hidden>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Update commondocgenerator.class.php
Commit: 343e6ce8b3ba610f4199421d9d1b35cfa54c8b7e
https://github.com/Dolibarr/dolibarr/commit/343e6ce8b3ba610f4199421d9d1b35cfa54c8b7e
Author: Frédéric FRANCE <address@hidden>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
typo
Commit: 58d339597b581e8933b80b0d5abe0eea9d3316f2
https://github.com/Dolibarr/dolibarr/commit/58d339597b581e8933b80b0d5abe0eea9d3316f2
Author: Frédéric FRANCE <address@hidden>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
A htdocs/dav/index.html
Log Message:
-----------
Create index.html
Commit: 89d55f3b4693960492e87d24fbc89810d343f330
https://github.com/Dolibarr/dolibarr/commit/89d55f3b4693960492e87d24fbc89810d343f330
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M htdocs/modulebuilder/index.php
A htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php
R htdocs/modulebuilder/template/lib/myobject.lib.php
M htdocs/modulebuilder/template/myobject_agenda.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_document.php
M htdocs/modulebuilder/template/myobject_note.php
Log Message:
-----------
Fix lib in modulebuilder
Commit: 085f8cf604e32630bf3ed12b49545471a68db847
https://github.com/Dolibarr/dolibarr/commit/085f8cf604e32630bf3ed12b49545471a68db847
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M htdocs/modulebuilder/template/README.md
Log Message:
-----------
Fix bad link
Commit: a153b2f121219db04e666ce51c499a42709daae6
https://github.com/Dolibarr/dolibarr/commit/a153b2f121219db04e666ce51c499a42709daae6
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M htdocs/modulebuilder/template/README.md
Log Message:
-----------
Fix bad link
Commit: 79aa0bbd1c3f067b6950929444d44724b4eafa2b
https://github.com/Dolibarr/dolibarr/commit/79aa0bbd1c3f067b6950929444d44724b4eafa2b
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M htdocs/modulebuilder/template/myobject_card.php
Log Message:
-----------
Fix duplicate load
Commit: 27978ed9a06edccd438417aa757c187edda2d27c
https://github.com/Dolibarr/dolibarr/commit/27978ed9a06edccd438417aa757c187edda2d27c
Author: Frédéric FRANCE <address@hidden>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M htdocs/product/stock/productlot_list.php
Log Message:
-----------
Update productlot_list.php
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/62492-dolibarr-8-erreur-sql-avec-le-menu-lots-series
Commit: eb4e42bc405aae0db2ffcc5589994bfea04b7454
https://github.com/Dolibarr/dolibarr/commit/eb4e42bc405aae0db2ffcc5589994bfea04b7454
Author: atm-ph <address@hidden>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M htdocs/contact/class/contact.class.php
Log Message:
-----------
Fix datec and tms missing in fetch method for API
Commit: d9beb3f88230188c731e7a75fcc64df0bc3fe4bb
https://github.com/Dolibarr/dolibarr/commit/d9beb3f88230188c731e7a75fcc64df0bc3fe4bb
Author: atm-ph <address@hidden>
Date: 2018-08-27 (Mon, 27 Aug 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix tms missing in fetch propal
Commit: 8cacda1c1e2436a3b17b4af5083bd99ecf4dd97d
https://github.com/Dolibarr/dolibarr/commit/8cacda1c1e2436a3b17b4af5083bd99ecf4dd97d
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-27 (Mon, 27 Aug 2018)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Fix error message
Commit: 79aa390fe84cee2690974e9d55639f121cf9883c
https://github.com/Dolibarr/dolibarr/commit/79aa390fe84cee2690974e9d55639f121cf9883c
Author: gauthier <address@hidden>
Date: 2018-08-27 (Mon, 27 Aug 2018)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
FIX : table llx_chargessociales doesn't exists
Commit: d2154e72c0b079dfb9e492754ec0d187cc1ae778
https://github.com/Dolibarr/dolibarr/commit/d2154e72c0b079dfb9e492754ec0d187cc1ae778
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-27 (Mon, 27 Aug 2018)
Changed paths:
M htdocs/core/boxes/box_propales.php
Log Message:
-----------
Fix trans
Commit: 90c3f8afcee6edd55591e0902a4de0f13a006a39
https://github.com/Dolibarr/dolibarr/commit/90c3f8afcee6edd55591e0902a4de0f13a006a39
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-27 (Mon, 27 Aug 2018)
Changed paths:
M htdocs/core/boxes/box_propales.php
Log Message:
-----------
Fix trans
Commit: 030099138939e5bf0066ffa75e167ecaca932a1e
https://github.com/Dolibarr/dolibarr/commit/030099138939e5bf0066ffa75e167ecaca932a1e
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-27 (Mon, 27 Aug 2018)
Changed paths:
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/boxes/box_propales.php
Log Message:
-----------
Fix trans
Commit: e00d6eda7ee4a96c03e342278dc2809552096df5
https://github.com/Dolibarr/dolibarr/commit/e00d6eda7ee4a96c03e342278dc2809552096df5
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/product/stock/productlot_list.php
Log Message:
-----------
Update productlot_list.php
Commit: 751fc512afa078199fc735f2c2a03135e30510f6
https://github.com/Dolibarr/dolibarr/commit/751fc512afa078199fc735f2c2a03135e30510f6
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/product/stock/productlot_list.php
Log Message:
-----------
Merge pull request #9301 from frederic34/patch-26
FIX sql error
Commit: 0d91aff32c182838878176e6ae70b5ee7f19c849
https://github.com/Dolibarr/dolibarr/commit/0d91aff32c182838878176e6ae70b5ee7f19c849
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/contact/class/contact.class.php
Log Message:
-----------
Merge pull request #9304 from atm-ph/fix_attributes_missing_for_api
Fix datec and tms missing in fetch method for API
Commit: f9c1dd8edd127cae6555acee11619f1b8fc37916
https://github.com/Dolibarr/dolibarr/commit/f9c1dd8edd127cae6555acee11619f1b8fc37916
Author: Norbert Penel <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
There is a begin transaction without rollback
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
Commit: faa29f9ae0e020c7443aa9e1e2a4033723cc9c29
https://github.com/Dolibarr/dolibarr/commit/faa29f9ae0e020c7443aa9e1e2a4033723cc9c29
Author: Frédéric FRANCE <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/core/class/antivir.class.php
Log Message:
-----------
Update antivir.class.php
Commit: ca8a22a3ad4ab0bc830d5e3977e85fcb3a4ce81f
https://github.com/Dolibarr/dolibarr/commit/ca8a22a3ad4ab0bc830d5e3977e85fcb3a4ce81f
Author: ptibogxiv <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/adherents/class/adherent.class.php
Log Message:
-----------
fix sync user/member
add more fields to sync
Commit: 6556ace2bc15243c8f518c445415a1eda79cfde2
https://github.com/Dolibarr/dolibarr/commit/6556ace2bc15243c8f518c445415a1eda79cfde2
Author: ptibogxiv <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix sync user->member
add more fields
Commit: 534eadb7a20b0739e1dee305755cafcde8b94c8c
https://github.com/Dolibarr/dolibarr/commit/534eadb7a20b0739e1dee305755cafcde8b94c8c
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/contact/class/contact.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: ad0cc098ee2fc4885de7cddaad716c86557f6cfc
https://github.com/Dolibarr/dolibarr/commit/ad0cc098ee2fc4885de7cddaad716c86557f6cfc
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
Log Message:
-----------
Fix alter forgot
Commit: 1f807b921658ec4aa70102646c87741c4ea9e081
https://github.com/Dolibarr/dolibarr/commit/1f807b921658ec4aa70102646c87741c4ea9e081
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Merge pull request #9305 from atm-gauthier/7.0_fix_altertable_charges
FIX : table llx_chargessociales doesn't exists
Commit: b4652ea24b9cb494b74701948d2ef8089a1023c2
https://github.com/Dolibarr/dolibarr/commit/b4652ea24b9cb494b74701948d2ef8089a1023c2
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
A htdocs/dav/index.html
Log Message:
-----------
Merge pull request #9292 from frederic34/patch-24
Create index.html
Commit: 0d138b8fc03215b4412edc28422a0221f265c444
https://github.com/Dolibarr/dolibarr/commit/0d138b8fc03215b4412edc28422a0221f265c444
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
A htdocs/dav/index.html
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: d90eed30985e1fb5ca31ec21b5dd04e0bfc4d33a
https://github.com/Dolibarr/dolibarr/commit/d90eed30985e1fb5ca31ec21b5dd04e0bfc4d33a
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Merge pull request #9291 from frederic34/patch-23
typo
Commit: 4369be7b393913698d64e0fc00defcb615654471
https://github.com/Dolibarr/dolibarr/commit/4369be7b393913698d64e0fc00defcb615654471
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Merge pull request #9284 from frederic34/patch-20
Update commondocgenerator.class.php
Commit: 0a7ce338f96d53319045c91eaaba3d062bbf08b3
https://github.com/Dolibarr/dolibarr/commit/0a7ce338f96d53319045c91eaaba3d062bbf08b3
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/commondocgenerator.class.php
Commit: 2db84a679e748669045407a3ed39aecf9c9fe873
https://github.com/Dolibarr/dolibarr/commit/2db84a679e748669045407a3ed39aecf9c9fe873
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/class/commondocgenerator.class.php
A htdocs/dav/index.html
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/README.md
A htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php
R htdocs/modulebuilder/template/lib/myobject.lib.php
M htdocs/modulebuilder/template/myobject_agenda.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_document.php
M htdocs/modulebuilder/template/myobject_note.php
M htdocs/product/stock/productlot_list.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/index.php
Commit: 9c6ce4b29d9b10eac083471db8d8f659ad9c1d3e
https://github.com/Dolibarr/dolibarr/commit/9c6ce4b29d9b10eac083471db8d8f659ad9c1d3e
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M .travis.yml
M build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js
M build/aps/Limitations of APS Support in the Panel_fichiers/prettify.css
M build/aps/Limitations of APS Support in the Panel_fichiers/prettify.js
M build/aps/Limitations of APS Support in the Panel_fichiers/stylesheet.css
M dev/initdata/import-products.php
M dev/initdata/import-users.php
M dev/initdemo/updatedemo.php
M dev/setup/codesniffer/ruleset.xml
M htdocs/accountancy/admin/importaccounts.php
M htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
M htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
M htdocs/admin/bank.php
M htdocs/admin/company.php
M htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
M htdocs/admin/dolistore/css/dolistore.css
M htdocs/admin/events.php
M htdocs/admin/ihm.php
M htdocs/admin/ldap_members.php
M htdocs/admin/limits.php
M htdocs/admin/mails.php
M htdocs/admin/mails_emailing.php
M htdocs/admin/menus.php
M htdocs/admin/modules.php
M htdocs/admin/pdf.php
M htdocs/admin/receiptprinter.php
M htdocs/admin/sms.php
M htdocs/admin/stock.php
M htdocs/admin/system/modules.php
M htdocs/admin/ticket.php
M htdocs/asterisk/cidlookup.php
M htdocs/blockedlog/admin/blockedlog_list.php
M htdocs/cashdesk/css/style.css
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/card.php
M htdocs/compta/bank/class/bankcateg.class.php
M htdocs/core/ajax/check_notifications.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/commonobjectline.class.php
M htdocs/core/class/dolreceiptprinter.class.php
M htdocs/core/class/html.formcontract.class.php
M htdocs/core/class/html.formpropal.class.php
M htdocs/core/js/blockUI.js
M htdocs/core/js/listview.js
M htdocs/core/js/timesheet.js
M htdocs/core/lib/barcode.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/lib/format_cards.lib.php
M htdocs/core/lib/hrm.lib.php
M htdocs/core/lib/invoice.lib.php
M htdocs/core/lib/loan.lib.php
M htdocs/core/lib/modulebuilder.lib.php
M htdocs/core/lib/xcal.lib.php
M htdocs/core/modules/barcode/doc/phpbarcode.modules.php
M htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
M htdocs/core/modules/cheque/doc/pdf_blochet.class.php
M htdocs/core/modules/cheque/modules_chequereceipts.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.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/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/facture/mod_facture_mercure.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/core/modules/project/doc/pdf_beluga.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/stock/doc/pdf_standard.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/modules/syslog/mod_syslog_firephp.php
M htdocs/core/tpl/advtarget.tpl.php
M htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
M htdocs/don/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/card-rec.php
M htdocs/fichinter/index.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/rapport.php
M htdocs/fourn/js/lib_dispatch.js
M htdocs/hrm/class/establishment.class.php
M htdocs/index.php
M htdocs/install/default.css
M htdocs/multicurrency/class/multicurrency.class.php
M htdocs/opensurvey/css/style.css
M htdocs/printing/index.php
M htdocs/product/class/product.class.php
M htdocs/product/inventory/ajax/ajax.inventory.php
M htdocs/product/list.php
M htdocs/product/price.php
M htdocs/product/stock/class/productlot.class.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/public/demo/demo.css
M htdocs/public/members/new.php
M htdocs/public/notice.php
M htdocs/public/payment/newpayment.php
M htdocs/public/stripe/ipn.php
M htdocs/public/ticket/create_ticket.php
M htdocs/public/ticket/list.php
M htdocs/public/ticket/view.php
M htdocs/resource/list.php
M htdocs/stripe/transaction.php
M htdocs/support/default.css
M htdocs/theme/eldy/ckeditor/config.js
M htdocs/theme/md/ckeditor/config.js
M htdocs/ticket/class/ticket.class.php
M htdocs/variants/generator.php
M test/phpunit/ChargeSocialesTest.php
M test/phpunit/CoreTest.php
M test/phpunit/UserGroupTest.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 45e30271b35aa37c973cf2fdfdf793c53d811b76
https://github.com/Dolibarr/dolibarr/commit/45e30271b35aa37c973cf2fdfdf793c53d811b76
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-28 (Tue, 28 Aug 2018)
Changed paths:
M htdocs/modulebuilder/index.php
Log Message:
-----------
Merge
Compare:
https://github.com/Dolibarr/dolibarr/compare/9a14611d55d9...45e30271b35a
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.