[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] dcc5ad: Merge branch 'develop' of htt
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] dcc5ad: Merge branch 'develop' of https://github.com/Dolib... |
Date: |
Sat, 28 Oct 2017 13:00:31 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: dcc5adf93b7808fe8374117221c881906f98f200
https://github.com/Dolibarr/dolibarr/commit/dcc5adf93b7808fe8374117221c881906f98f200
Author: Neil Orley <address@hidden>
Date: 2017-10-26 (Thu, 26 Oct 2017)
Changed paths:
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/modulehelp.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/actions_addupdatedelete.inc.php
A htdocs/core/ajax/selectobject.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/emailsenderprofile.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/core/tpl/card_presend.tpl.php
A htdocs/core/tpl/commonfields_add.tpl.php
A htdocs/core/tpl/commonfields_edit.tpl.php
A htdocs/core/tpl/commonfields_view.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/don/class/don.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/install/mysql/data/llx_accounting_account_ch.sql
M htdocs/install/mysql/data/llx_accounting_account_fr.sql
M htdocs/install/mysql/data/llx_accounting_account_lu.sql
M htdocs/install/mysql/data/llx_accounting_account_tn.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_websiteaccount.key.sql
M htdocs/install/mysql/tables/llx_websiteaccount.sql
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/website.lang
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/sql/llx_myobject.key.sql
M htdocs/product/class/product.class.php
M htdocs/product/inventory/class/inventory.class.php
M htdocs/projet/class/project.class.php
M htdocs/societe/ajax/company.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/website.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/website/class/website.class.php
M htdocs/website/class/websiteaccount.class.php
M htdocs/website/class/websitepage.class.php
A htdocs/website/lib/websiteaccount.lib.php
M htdocs/website/websiteaccount_card.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into
develop-api
Commit: fbabacf19a4cc825798621e10637ae99c086ffe8
https://github.com/Dolibarr/dolibarr/commit/fbabacf19a4cc825798621e10637ae99c086ffe8
Author: Neil Orley <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M .travis.yml
M COPYRIGHT
M htdocs/blockedlog/class/blockedlog.class.php
M htdocs/collab/index.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/api_invoices.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/card.php
M htdocs/contrat/class/api_contracts.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formadmin.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/js/lib_head.js.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/website.lib.php
M
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
M htdocs/expedition/card.php
M htdocs/expensereport/ajax/ajaxik.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/class/expensereport_ik.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/document.php
A htdocs/includes/jquery/plugins/select2/dist/js/compat/containerCss.js
A htdocs/includes/jquery/plugins/select2/dist/js/select2.full.js
A htdocs/includes/jquery/plugins/select2/dist/js/select2.full.min.js
M htdocs/includes/jquery/plugins/select2/dist/js/select2.js
M htdocs/includes/jquery/plugins/select2/dist/js/select2.min.js
M htdocs/index.php
M htdocs/install/mysql/data/llx_accounting_abc.sql
A htdocs/install/mysql/data/llx_accounting_account_bf.sql
A htdocs/install/mysql/data/llx_accounting_account_bj.sql
A htdocs/install/mysql/data/llx_accounting_account_cd.sql
A htdocs/install/mysql/data/llx_accounting_account_cf.sql
A htdocs/install/mysql/data/llx_accounting_account_cg.sql
A htdocs/install/mysql/data/llx_accounting_account_ci.sql
A htdocs/install/mysql/data/llx_accounting_account_cm.sql
A htdocs/install/mysql/data/llx_accounting_account_ga.sql
A htdocs/install/mysql/data/llx_accounting_account_gq.sql
A htdocs/install/mysql/data/llx_accounting_account_km.sql
A htdocs/install/mysql/data/llx_accounting_account_ma.sql
A htdocs/install/mysql/data/llx_accounting_account_ml.sql
A htdocs/install/mysql/data/llx_accounting_account_ne.sql
A htdocs/install/mysql/data/llx_accounting_account_sn.sql
A htdocs/install/mysql/data/llx_accounting_account_td.sql
A htdocs/install/mysql/data/llx_accounting_account_tg.sql
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_expensereport_ik.sql
M htdocs/install/mysql/tables/llx_projet_task.sql
M htdocs/install/mysql/tables/llx_website.sql
M htdocs/install/step2.php
M htdocs/install/step4.php
M htdocs/install/step5.php
M htdocs/install/upgrade.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/website.lang
M htdocs/main.inc.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/product/list.php
M htdocs/projet/list.php
A htdocs/public/website/index.php
A htdocs/public/website/styles.css.php
R htdocs/public/websites/index.php
R htdocs/public/websites/styles.css.php
M htdocs/societe/card.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/notify/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/website/class/website.class.php
M htdocs/website/index.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into
develop-api
Commit: 9a1c684870722ac7ce145e52a1c3e9fa1d229905
https://github.com/Dolibarr/dolibarr/commit/9a1c684870722ac7ce145e52a1c3e9fa1d229905
Author: Neil Orley <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/compta/facture/class/api_invoices.class.php
Log Message:
-----------
FIX wrong paramters name in the usecreditnote method
Rename 'creditnoteid' with 'discountid' in the URI
Rename 'creditId' with 'discountid' in the method
Commit: da1afa80cfdec8f4fa7c6f4212f25988660ca999
https://github.com/Dolibarr/dolibarr/commit/da1afa80cfdec8f4fa7c6f4212f25988660ca999
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-28 (Sat, 28 Oct 2017)
Changed paths:
M htdocs/compta/facture/class/api_invoices.class.php
Log Message:
-----------
Merge pull request #7718 from Oeris/develop-api
FIX wrong paramters name in the usecreditnote method
Compare:
https://github.com/Dolibarr/dolibarr/compare/46f95e14fa38...da1afa80cfde
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] dcc5ad: Merge branch 'develop' of https://github.com/Dolib...,
Laurent Destailleur <=