[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 50a26a: fix merge
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 50a26a: fix merge |
|
Date: |
Fri, 07 Sep 2018 10:38:59 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 50a26aaf16e1dbf33fbd825f9f5824967bda109b
https://github.com/Dolibarr/dolibarr/commit/50a26aaf16e1dbf33fbd825f9f5824967bda109b
Author: Philippe GRAND <address@hidden>
Date: 2018-09-04 (Tue, 04 Sep 2018)
Changed paths:
M ChangeLog
M htdocs/accountancy/admin/account.php
M htdocs/adherents/list.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/events.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/triggers/interface_20_all_Logevents.class.php
M htdocs/install/mysql/data/llx_accounting_abc.sql
M htdocs/install/mysql/data/llx_accounting_account_be.sql
M htdocs/install/mysql/data/llx_accounting_account_bf.sql
M htdocs/install/mysql/data/llx_accounting_account_bj.sql
M htdocs/install/mysql/data/llx_accounting_account_cd.sql
M htdocs/install/mysql/data/llx_accounting_account_cf.sql
M htdocs/install/mysql/data/llx_accounting_account_cg.sql
M htdocs/install/mysql/data/llx_accounting_account_ch.sql
M htdocs/install/mysql/data/llx_accounting_account_ci.sql
M htdocs/install/mysql/data/llx_accounting_account_cl.sql
M htdocs/install/mysql/data/llx_accounting_account_cm.sql
M htdocs/install/mysql/data/llx_accounting_account_de.sql
M htdocs/install/mysql/data/llx_accounting_account_dk.sql
A htdocs/install/mysql/data/llx_accounting_account_dz.sql
M htdocs/install/mysql/data/llx_accounting_account_es.sql
M htdocs/install/mysql/data/llx_accounting_account_fr.sql
M htdocs/install/mysql/data/llx_accounting_account_ga.sql
M htdocs/install/mysql/data/llx_accounting_account_gb.sql
M htdocs/install/mysql/data/llx_accounting_account_gq.sql
M htdocs/install/mysql/data/llx_accounting_account_km.sql
M htdocs/install/mysql/data/llx_accounting_account_lu.sql
M htdocs/install/mysql/data/llx_accounting_account_ma.sql
M htdocs/install/mysql/data/llx_accounting_account_ml.sql
M htdocs/install/mysql/data/llx_accounting_account_ne.sql
M htdocs/install/mysql/data/llx_accounting_account_ro.sql
M htdocs/install/mysql/data/llx_accounting_account_sn.sql
M htdocs/install/mysql/data/llx_accounting_account_td.sql
M htdocs/install/mysql/data/llx_accounting_account_tg.sql
M htdocs/install/mysql/data/llx_accounting_account_tn.sql
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
M htdocs/install/mysql/tables/llx_accounting_account.sql
M htdocs/install/mysql/tables/llx_categorie.sql
M htdocs/main.inc.php
M
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/ticket/class/ticket.class.php
M htdocs/user/logout.php
M scripts/cron/cron_run_jobs.php
Log Message:
-----------
fix merge
Commit: c32c67ca573b3f90a871fa34d5f396549680ea48
https://github.com/Dolibarr/dolibarr/commit/c32c67ca573b3f90a871fa34d5f396549680ea48
Author: Philippe Grand <address@hidden>
Date: 2018-09-04 (Tue, 04 Sep 2018)
Changed paths:
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/subscription.class.php
M htdocs/asset/class/asset.class.php
M htdocs/asset/class/asset_type.class.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/class/discount.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/class/societeaccount.class.php
M htdocs/stripe/class/stripe.class.php
M htdocs/ticket/class/actions_ticket.class.php
M htdocs/ticket/class/ticket.class.php
Log Message:
-----------
Merge branch 'develop' into develop
Commit: e9c2a475bc0727b3dbdb8c3f0454e75a63e81fe3
https://github.com/Dolibarr/dolibarr/commit/e9c2a475bc0727b3dbdb8c3f0454e75a63e81fe3
Author: Philippe GRAND <address@hidden>
Date: 2018-09-06 (Thu, 06 Sep 2018)
Changed paths:
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/subscription.class.php
M htdocs/admin/delais.php
M htdocs/asset/class/asset.class.php
M htdocs/asset/class/asset_type.class.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/api_agendaevents.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/contact/list.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/lib/pdf.lib.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/modAdherent.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modAsset.class.php
M htdocs/core/modules/modDav.class.php
M htdocs/core/modules/modFacture.class.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/cron/list.php
M htdocs/expedition/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/holiday/month_report.php
M htdocs/hrm/index.php
M htdocs/imports/import.php
M htdocs/index.php
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/mysql/tables/llx_commande.key.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/cron.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/product/class/productcustomerprice.class.php
A htdocs/product/dynamic_price/class/index.html
A htdocs/product/dynamic_price/index.html
M htdocs/product/reassort.php
M htdocs/projet/element.php
M htdocs/public/payment/paymentok.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/class/societeaccount.class.php
M htdocs/societe/list.php
M htdocs/stripe/class/stripe.class.php
M htdocs/ticket/class/actions_ticket.class.php
M htdocs/ticket/class/ticket.class.php
M htdocs/user/card.php
Log Message:
-----------
fix merge
Commit: 97c740f510b5279613510e0bc3ba9c564659e4fa
https://github.com/Dolibarr/dolibarr/commit/97c740f510b5279613510e0bc3ba9c564659e4fa
Author: Philippe GRAND <address@hidden>
Date: 2018-09-06 (Thu, 06 Sep 2018)
Changed paths:
M htdocs/asset/class/asset.class.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/core/class/discount.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
Commit: a6d13b06b0f8f6ea04145bccaa654ea22fea7a32
https://github.com/Dolibarr/dolibarr/commit/a6d13b06b0f8f6ea04145bccaa654ea22fea7a32
Author: Philippe GRAND <address@hidden>
Date: 2018-09-07 (Fri, 07 Sep 2018)
Changed paths:
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/admin/adherent_emails.php
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/adherents/admin/website.php
M htdocs/adherents/agenda.php
M htdocs/adherents/document.php
M htdocs/adherents/index.php
M htdocs/adherents/ldap.php
M htdocs/adherents/note.php
M htdocs/adherents/stats/byproperties.php
M htdocs/adherents/stats/geo.php
M htdocs/adherents/stats/index.php
M htdocs/adherents/subscription/card.php
M htdocs/adherents/subscription/info.php
M htdocs/adherents/type_ldap.php
Log Message:
-----------
Standardize and update call to
Commit: af37b08da3e36b76fca7cf59fa815fd491afbc01
https://github.com/Dolibarr/dolibarr/commit/af37b08da3e36b76fca7cf59fa815fd491afbc01
Author: Philippe GRAND <address@hidden>
Date: 2018-09-07 (Fri, 07 Sep 2018)
Changed paths:
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into new_branch_07_09_2018
Commit: 035b2be2eb90bd7334ce256d5370cfeec55c63b4
https://github.com/Dolibarr/dolibarr/commit/035b2be2eb90bd7334ce256d5370cfeec55c63b4
Author: Philippe GRAND <address@hidden>
Date: 2018-09-07 (Fri, 07 Sep 2018)
Changed paths:
M htdocs/admin/menus/edit.php
M htdocs/admin/menus/index.php
M htdocs/admin/menus/other.php
M htdocs/admin/system/about.php
M htdocs/admin/system/browser.php
M htdocs/admin/system/constall.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/system/modules.php
M htdocs/admin/system/perf.php
Log Message:
-----------
Standardize and update call to langs
Commit: 86cf289f148e9daadc1cdf9e288abae7755d2e43
https://github.com/Dolibarr/dolibarr/commit/86cf289f148e9daadc1cdf9e288abae7755d2e43
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-07 (Fri, 07 Sep 2018)
Changed paths:
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/admin/adherent_emails.php
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/adherents/admin/website.php
M htdocs/adherents/agenda.php
M htdocs/adherents/document.php
M htdocs/adherents/index.php
M htdocs/adherents/ldap.php
M htdocs/adherents/note.php
M htdocs/adherents/stats/byproperties.php
M htdocs/adherents/stats/geo.php
M htdocs/adherents/stats/index.php
M htdocs/adherents/subscription/card.php
M htdocs/adherents/subscription/info.php
M htdocs/adherents/type_ldap.php
M htdocs/admin/menus/edit.php
M htdocs/admin/menus/index.php
M htdocs/admin/menus/other.php
M htdocs/admin/system/about.php
M htdocs/admin/system/browser.php
M htdocs/admin/system/constall.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/system/modules.php
M htdocs/admin/system/perf.php
M htdocs/asset/class/asset.class.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/lib/company.lib.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Merge pull request #9430 from grandoc/new_branch_07_09_2018
New branch 07 09 2018
Compare:
https://github.com/Dolibarr/dolibarr/compare/aa562c9c691e...86cf289f148e
**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.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 50a26a: fix merge,
Laurent Destailleur <=