[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] cc2609: Update database
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] cc2609: Update database |
|
Date: |
Mon, 06 Nov 2017 00:25:17 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: cc260954670adccbae201e7c42a60145333eff57
https://github.com/Dolibarr/dolibarr/commit/cc260954670adccbae201e7c42a60145333eff57
Author: Alexandre SPANGARO <address@hidden>
Date: 2017-10-31 (Tue, 31 Oct 2017)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_product.sql
Log Message:
-----------
Update database
Commit: 8d3beef16116f7a30cdaa0d7b7d9a5ed49aa5084
https://github.com/Dolibarr/dolibarr/commit/8d3beef16116f7a30cdaa0d7b7d9a5ed49aa5084
Author: Alexandre SPANGARO <address@hidden>
Date: 2017-11-01 (Wed, 01 Nov 2017)
Changed paths:
M htdocs/product/card.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Add fields in product card
Commit: 2a5382b24e4726bed2a5156df5823f4804d5903f
https://github.com/Dolibarr/dolibarr/commit/2a5382b24e4726bed2a5156df5823f4804d5903f
Author: Alexandre SPANGARO <address@hidden>
Date: 2017-11-01 (Wed, 01 Nov 2017)
Changed paths:
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Add language
Commit: 2d17e4094c299fdadf0ba66e5031dbc8d1de1af6
https://github.com/Dolibarr/dolibarr/commit/2d17e4094c299fdadf0ba66e5031dbc8d1de1af6
Author: Alexandre SPANGARO <address@hidden>
Date: 2017-11-03 (Fri, 03 Nov 2017)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M dev/initdata/purge-data.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/list.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_other.php
M htdocs/admin/chequereceipts.php
M htdocs/admin/commande.php
M htdocs/admin/contract.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/expedition.php
M htdocs/admin/expensereport.php
M htdocs/admin/facture.php
M htdocs/admin/fichinter.php
M htdocs/admin/livraison.php
M htdocs/admin/mails_senderprofile_list.php
M htdocs/admin/propal.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplier_proposal.php
M htdocs/admin/translation.php
M htdocs/api/index.php
M htdocs/blockedlog/class/blockedlog.class.php
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/comm/action/class/actioncomm.class.php
A htdocs/comm/action/class/actioncommreminder.class.php
M htdocs/comm/action/index.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/bank/bankentries_list.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/list.php
M htdocs/compta/facture/class/api_invoices.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/compta/facture/list.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/list.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/index.php
M htdocs/contrat/list.php
R htdocs/contrat/services.php
A htdocs/contrat/services_list.php
M htdocs/core/actions_extrafields.inc.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/core/boxes/box_ficheinter.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/modulebuilder.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/search_page.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/document.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/ecm/docfile.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/list.php
M htdocs/expedition/shipment.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/list.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/list.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/class/holiday.class.php
M htdocs/includes/stripe/build.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_accounting_account.sql
M htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
M htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
A htdocs/install/mysql/tables/llx_actioncomm_reminder.key.sql
A htdocs/install/mysql/tables/llx_actioncomm_reminder.sql
M htdocs/install/mysql/tables/llx_blockedlog.sql
M htdocs/install/mysql/tables/llx_bordereau_cheque.sql
M htdocs/install/mysql/tables/llx_chargesociales.sql
M htdocs/install/mysql/tables/llx_commande.sql
M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
M htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
M htdocs/install/mysql/tables/llx_commandedet.sql
M htdocs/install/mysql/tables/llx_don.sql
M htdocs/install/mysql/tables/llx_expensereport_rules.sql
M htdocs/install/mysql/tables/llx_loan.sql
M htdocs/install/mysql/tables/llx_loan_schedule.sql
M htdocs/install/mysql/tables/llx_paiementcharge.sql
M htdocs/install/mysql/tables/llx_paiementfourn.sql
M htdocs/install/mysql/tables/llx_payment_donation.sql
M htdocs/install/mysql/tables/llx_payment_expensereport.sql
M htdocs/install/mysql/tables/llx_payment_loan.sql
M htdocs/install/mysql/tables/llx_payment_salary.sql
M htdocs/install/mysql/tables/llx_prelevement_bons.sql
M htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
M htdocs/install/mysql/tables/llx_prelevement_lignes.sql
M htdocs/install/mysql/tables/llx_societe.sql
M htdocs/install/mysql/tables/llx_subscription.sql
M htdocs/install/mysql/tables/llx_tva.sql
M htdocs/langs/ar_SA/accountancy.lang
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/commercial.lang
M htdocs/langs/ar_SA/holiday.lang
M htdocs/langs/ar_SA/mails.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/ar_SA/members.lang
M htdocs/langs/ar_SA/modulebuilder.lang
M htdocs/langs/ar_SA/products.lang
M htdocs/langs/ar_SA/projects.lang
M htdocs/langs/ar_SA/salaries.lang
M htdocs/langs/ar_SA/stocks.lang
M htdocs/langs/ar_SA/trips.lang
M htdocs/langs/ar_SA/website.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/commercial.lang
M htdocs/langs/bg_BG/holiday.lang
M htdocs/langs/bg_BG/mails.lang
M htdocs/langs/bg_BG/main.lang
M htdocs/langs/bg_BG/members.lang
M htdocs/langs/bg_BG/modulebuilder.lang
M htdocs/langs/bg_BG/projects.lang
M htdocs/langs/bg_BG/salaries.lang
M htdocs/langs/bg_BG/stocks.lang
M htdocs/langs/bg_BG/trips.lang
M htdocs/langs/bg_BG/website.lang
M htdocs/langs/bn_BD/admin.lang
M htdocs/langs/bn_BD/commercial.lang
M htdocs/langs/bn_BD/holiday.lang
M htdocs/langs/bn_BD/mails.lang
M htdocs/langs/bn_BD/main.lang
M htdocs/langs/bn_BD/members.lang
M htdocs/langs/bn_BD/modulebuilder.lang
M htdocs/langs/bn_BD/projects.lang
M htdocs/langs/bn_BD/salaries.lang
M htdocs/langs/bn_BD/stocks.lang
M htdocs/langs/bn_BD/trips.lang
M htdocs/langs/bn_BD/website.lang
M htdocs/langs/bs_BA/admin.lang
M htdocs/langs/bs_BA/commercial.lang
M htdocs/langs/bs_BA/holiday.lang
M htdocs/langs/bs_BA/mails.lang
M htdocs/langs/bs_BA/main.lang
M htdocs/langs/bs_BA/members.lang
M htdocs/langs/bs_BA/modulebuilder.lang
M htdocs/langs/bs_BA/projects.lang
M htdocs/langs/bs_BA/salaries.lang
M htdocs/langs/bs_BA/stocks.lang
M htdocs/langs/bs_BA/trips.lang
M htdocs/langs/bs_BA/website.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/commercial.lang
M htdocs/langs/ca_ES/holiday.lang
M htdocs/langs/ca_ES/mails.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/members.lang
M htdocs/langs/ca_ES/modulebuilder.lang
M htdocs/langs/ca_ES/projects.lang
M htdocs/langs/ca_ES/salaries.lang
M htdocs/langs/ca_ES/stocks.lang
M htdocs/langs/ca_ES/trips.lang
M htdocs/langs/ca_ES/website.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/commercial.lang
M htdocs/langs/cs_CZ/holiday.lang
M htdocs/langs/cs_CZ/mails.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/cs_CZ/members.lang
M htdocs/langs/cs_CZ/modulebuilder.lang
M htdocs/langs/cs_CZ/projects.lang
M htdocs/langs/cs_CZ/salaries.lang
M htdocs/langs/cs_CZ/stocks.lang
M htdocs/langs/cs_CZ/trips.lang
M htdocs/langs/cs_CZ/website.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/commercial.lang
M htdocs/langs/da_DK/holiday.lang
M htdocs/langs/da_DK/mails.lang
M htdocs/langs/da_DK/main.lang
M htdocs/langs/da_DK/members.lang
M htdocs/langs/da_DK/modulebuilder.lang
M htdocs/langs/da_DK/projects.lang
M htdocs/langs/da_DK/salaries.lang
M htdocs/langs/da_DK/stocks.lang
M htdocs/langs/da_DK/trips.lang
M htdocs/langs/da_DK/website.lang
M htdocs/langs/de_AT/admin.lang
M htdocs/langs/de_CH/admin.lang
M htdocs/langs/de_CH/main.lang
M htdocs/langs/de_CH/trips.lang
M htdocs/langs/de_CH/website.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/commercial.lang
M htdocs/langs/de_DE/holiday.lang
M htdocs/langs/de_DE/mails.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/members.lang
M htdocs/langs/de_DE/modulebuilder.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/salaries.lang
M htdocs/langs/de_DE/stocks.lang
M htdocs/langs/de_DE/trips.lang
M htdocs/langs/de_DE/website.lang
M htdocs/langs/el_CY/admin.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/commercial.lang
M htdocs/langs/el_GR/holiday.lang
M htdocs/langs/el_GR/mails.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/el_GR/members.lang
M htdocs/langs/el_GR/modulebuilder.lang
M htdocs/langs/el_GR/projects.lang
M htdocs/langs/el_GR/salaries.lang
M htdocs/langs/el_GR/stocks.lang
M htdocs/langs/el_GR/trips.lang
M htdocs/langs/el_GR/website.lang
M htdocs/langs/en_AU/admin.lang
M htdocs/langs/en_CA/admin.lang
M htdocs/langs/en_GB/admin.lang
M htdocs/langs/en_GB/bills.lang
M htdocs/langs/en_GB/main.lang
M htdocs/langs/en_GB/website.lang
M htdocs/langs/en_IN/admin.lang
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/stripe.lang
M htdocs/langs/en_US/suppliers.lang
M htdocs/langs/es_AR/admin.lang
M htdocs/langs/es_BO/admin.lang
M htdocs/langs/es_CL/admin.lang
M htdocs/langs/es_CO/admin.lang
M htdocs/langs/es_DO/admin.lang
M htdocs/langs/es_EC/admin.lang
M htdocs/langs/es_EC/main.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/commercial.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/es_ES/mails.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/members.lang
M htdocs/langs/es_ES/modulebuilder.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/projects.lang
M htdocs/langs/es_ES/salaries.lang
M htdocs/langs/es_ES/stocks.lang
M htdocs/langs/es_ES/trips.lang
M htdocs/langs/es_ES/website.lang
M htdocs/langs/es_MX/admin.lang
M htdocs/langs/es_MX/main.lang
M htdocs/langs/es_MX/trips.lang
M htdocs/langs/es_PA/admin.lang
M htdocs/langs/es_PE/accountancy.lang
M htdocs/langs/es_PE/admin.lang
M htdocs/langs/es_PE/bills.lang
M htdocs/langs/es_PE/companies.lang
M htdocs/langs/es_PE/main.lang
M htdocs/langs/es_PE/propal.lang
M htdocs/langs/es_PY/admin.lang
M htdocs/langs/es_VE/admin.lang
M htdocs/langs/es_VE/main.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/commercial.lang
M htdocs/langs/et_EE/holiday.lang
M htdocs/langs/et_EE/mails.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/et_EE/members.lang
M htdocs/langs/et_EE/modulebuilder.lang
M htdocs/langs/et_EE/projects.lang
M htdocs/langs/et_EE/salaries.lang
M htdocs/langs/et_EE/stocks.lang
M htdocs/langs/et_EE/trips.lang
M htdocs/langs/et_EE/website.lang
M htdocs/langs/eu_ES/admin.lang
M htdocs/langs/eu_ES/commercial.lang
M htdocs/langs/eu_ES/holiday.lang
M htdocs/langs/eu_ES/mails.lang
M htdocs/langs/eu_ES/main.lang
M htdocs/langs/eu_ES/members.lang
M htdocs/langs/eu_ES/modulebuilder.lang
M htdocs/langs/eu_ES/projects.lang
M htdocs/langs/eu_ES/salaries.lang
M htdocs/langs/eu_ES/stocks.lang
M htdocs/langs/eu_ES/trips.lang
M htdocs/langs/eu_ES/website.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fa_IR/commercial.lang
M htdocs/langs/fa_IR/holiday.lang
M htdocs/langs/fa_IR/mails.lang
M htdocs/langs/fa_IR/main.lang
M htdocs/langs/fa_IR/members.lang
M htdocs/langs/fa_IR/modulebuilder.lang
M htdocs/langs/fa_IR/projects.lang
M htdocs/langs/fa_IR/salaries.lang
M htdocs/langs/fa_IR/stocks.lang
M htdocs/langs/fa_IR/trips.lang
M htdocs/langs/fa_IR/website.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/commercial.lang
M htdocs/langs/fi_FI/holiday.lang
M htdocs/langs/fi_FI/mails.lang
M htdocs/langs/fi_FI/main.lang
M htdocs/langs/fi_FI/members.lang
M htdocs/langs/fi_FI/modulebuilder.lang
M htdocs/langs/fi_FI/projects.lang
M htdocs/langs/fi_FI/salaries.lang
M htdocs/langs/fi_FI/stocks.lang
M htdocs/langs/fi_FI/trips.lang
M htdocs/langs/fi_FI/website.lang
M htdocs/langs/fr_BE/admin.lang
M htdocs/langs/fr_CA/admin.lang
M htdocs/langs/fr_CA/mails.lang
M htdocs/langs/fr_CA/main.lang
M htdocs/langs/fr_CA/members.lang
M htdocs/langs/fr_CA/other.lang
M htdocs/langs/fr_CA/trips.lang
M htdocs/langs/fr_CA/website.lang
M htdocs/langs/fr_CH/admin.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/agenda.lang
M htdocs/langs/fr_FR/banks.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/commercial.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/fr_FR/contracts.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/fr_FR/ldap.lang
M htdocs/langs/fr_FR/mails.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/langs/fr_FR/modulebuilder.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/paypal.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/langs/fr_FR/salaries.lang
M htdocs/langs/fr_FR/sendings.lang
M htdocs/langs/fr_FR/stocks.lang
M htdocs/langs/fr_FR/stripe.lang
M htdocs/langs/fr_FR/trips.lang
M htdocs/langs/fr_FR/website.lang
M htdocs/langs/fr_FR/withdrawals.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/commercial.lang
M htdocs/langs/he_IL/holiday.lang
M htdocs/langs/he_IL/mails.lang
M htdocs/langs/he_IL/main.lang
M htdocs/langs/he_IL/members.lang
M htdocs/langs/he_IL/modulebuilder.lang
M htdocs/langs/he_IL/projects.lang
M htdocs/langs/he_IL/salaries.lang
M htdocs/langs/he_IL/stocks.lang
M htdocs/langs/he_IL/trips.lang
M htdocs/langs/he_IL/website.lang
M htdocs/langs/hr_HR/admin.lang
M htdocs/langs/hr_HR/commercial.lang
M htdocs/langs/hr_HR/holiday.lang
M htdocs/langs/hr_HR/mails.lang
M htdocs/langs/hr_HR/main.lang
M htdocs/langs/hr_HR/members.lang
M htdocs/langs/hr_HR/modulebuilder.lang
M htdocs/langs/hr_HR/projects.lang
M htdocs/langs/hr_HR/salaries.lang
M htdocs/langs/hr_HR/stocks.lang
M htdocs/langs/hr_HR/trips.lang
M htdocs/langs/hr_HR/website.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/commercial.lang
M htdocs/langs/hu_HU/holiday.lang
M htdocs/langs/hu_HU/mails.lang
M htdocs/langs/hu_HU/main.lang
M htdocs/langs/hu_HU/members.lang
M htdocs/langs/hu_HU/modulebuilder.lang
M htdocs/langs/hu_HU/projects.lang
M htdocs/langs/hu_HU/salaries.lang
M htdocs/langs/hu_HU/stocks.lang
M htdocs/langs/hu_HU/trips.lang
M htdocs/langs/hu_HU/website.lang
M htdocs/langs/id_ID/admin.lang
M htdocs/langs/id_ID/commercial.lang
M htdocs/langs/id_ID/holiday.lang
M htdocs/langs/id_ID/mails.lang
M htdocs/langs/id_ID/main.lang
M htdocs/langs/id_ID/members.lang
M htdocs/langs/id_ID/modulebuilder.lang
M htdocs/langs/id_ID/projects.lang
M htdocs/langs/id_ID/salaries.lang
M htdocs/langs/id_ID/stocks.lang
M htdocs/langs/id_ID/trips.lang
M htdocs/langs/id_ID/website.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/commercial.lang
M htdocs/langs/is_IS/holiday.lang
M htdocs/langs/is_IS/mails.lang
M htdocs/langs/is_IS/main.lang
M htdocs/langs/is_IS/members.lang
M htdocs/langs/is_IS/modulebuilder.lang
M htdocs/langs/is_IS/projects.lang
M htdocs/langs/is_IS/salaries.lang
M htdocs/langs/is_IS/stocks.lang
M htdocs/langs/is_IS/trips.lang
M htdocs/langs/is_IS/website.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/commercial.lang
M htdocs/langs/it_IT/holiday.lang
M htdocs/langs/it_IT/mails.lang
M htdocs/langs/it_IT/main.lang
M htdocs/langs/it_IT/members.lang
M htdocs/langs/it_IT/modulebuilder.lang
M htdocs/langs/it_IT/projects.lang
M htdocs/langs/it_IT/salaries.lang
M htdocs/langs/it_IT/stocks.lang
M htdocs/langs/it_IT/trips.lang
M htdocs/langs/it_IT/website.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/commercial.lang
M htdocs/langs/ja_JP/holiday.lang
M htdocs/langs/ja_JP/mails.lang
M htdocs/langs/ja_JP/main.lang
M htdocs/langs/ja_JP/members.lang
M htdocs/langs/ja_JP/modulebuilder.lang
M htdocs/langs/ja_JP/projects.lang
M htdocs/langs/ja_JP/salaries.lang
M htdocs/langs/ja_JP/stocks.lang
M htdocs/langs/ja_JP/trips.lang
M htdocs/langs/ja_JP/website.lang
M htdocs/langs/ka_GE/admin.lang
M htdocs/langs/ka_GE/commercial.lang
M htdocs/langs/ka_GE/holiday.lang
M htdocs/langs/ka_GE/mails.lang
M htdocs/langs/ka_GE/main.lang
M htdocs/langs/ka_GE/members.lang
M htdocs/langs/ka_GE/modulebuilder.lang
M htdocs/langs/ka_GE/projects.lang
M htdocs/langs/ka_GE/salaries.lang
M htdocs/langs/ka_GE/stocks.lang
M htdocs/langs/ka_GE/trips.lang
M htdocs/langs/ka_GE/website.lang
M htdocs/langs/km_KH/admin.lang
M htdocs/langs/km_KH/commercial.lang
M htdocs/langs/km_KH/holiday.lang
M htdocs/langs/km_KH/mails.lang
M htdocs/langs/km_KH/main.lang
M htdocs/langs/km_KH/members.lang
M htdocs/langs/km_KH/modulebuilder.lang
M htdocs/langs/km_KH/projects.lang
M htdocs/langs/km_KH/salaries.lang
M htdocs/langs/km_KH/stocks.lang
M htdocs/langs/km_KH/trips.lang
M htdocs/langs/km_KH/website.lang
M htdocs/langs/kn_IN/admin.lang
M htdocs/langs/kn_IN/commercial.lang
M htdocs/langs/kn_IN/holiday.lang
M htdocs/langs/kn_IN/mails.lang
M htdocs/langs/kn_IN/main.lang
M htdocs/langs/kn_IN/members.lang
M htdocs/langs/kn_IN/modulebuilder.lang
M htdocs/langs/kn_IN/projects.lang
M htdocs/langs/kn_IN/salaries.lang
M htdocs/langs/kn_IN/stocks.lang
M htdocs/langs/kn_IN/trips.lang
M htdocs/langs/kn_IN/website.lang
M htdocs/langs/ko_KR/admin.lang
M htdocs/langs/ko_KR/commercial.lang
M htdocs/langs/ko_KR/holiday.lang
M htdocs/langs/ko_KR/mails.lang
M htdocs/langs/ko_KR/main.lang
M htdocs/langs/ko_KR/members.lang
M htdocs/langs/ko_KR/modulebuilder.lang
M htdocs/langs/ko_KR/projects.lang
M htdocs/langs/ko_KR/salaries.lang
M htdocs/langs/ko_KR/stocks.lang
M htdocs/langs/ko_KR/trips.lang
M htdocs/langs/ko_KR/website.lang
M htdocs/langs/lo_LA/admin.lang
M htdocs/langs/lo_LA/commercial.lang
M htdocs/langs/lo_LA/holiday.lang
M htdocs/langs/lo_LA/mails.lang
M htdocs/langs/lo_LA/main.lang
M htdocs/langs/lo_LA/members.lang
M htdocs/langs/lo_LA/modulebuilder.lang
M htdocs/langs/lo_LA/projects.lang
M htdocs/langs/lo_LA/salaries.lang
M htdocs/langs/lo_LA/stocks.lang
M htdocs/langs/lo_LA/trips.lang
M htdocs/langs/lo_LA/website.lang
M htdocs/langs/lt_LT/admin.lang
M htdocs/langs/lt_LT/commercial.lang
M htdocs/langs/lt_LT/holiday.lang
M htdocs/langs/lt_LT/mails.lang
M htdocs/langs/lt_LT/main.lang
M htdocs/langs/lt_LT/members.lang
M htdocs/langs/lt_LT/modulebuilder.lang
M htdocs/langs/lt_LT/projects.lang
M htdocs/langs/lt_LT/salaries.lang
M htdocs/langs/lt_LT/stocks.lang
M htdocs/langs/lt_LT/trips.lang
M htdocs/langs/lt_LT/website.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/commercial.lang
M htdocs/langs/lv_LV/holiday.lang
M htdocs/langs/lv_LV/mails.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/members.lang
M htdocs/langs/lv_LV/modulebuilder.lang
M htdocs/langs/lv_LV/projects.lang
M htdocs/langs/lv_LV/salaries.lang
M htdocs/langs/lv_LV/stocks.lang
M htdocs/langs/lv_LV/trips.lang
M htdocs/langs/lv_LV/website.lang
M htdocs/langs/mk_MK/admin.lang
M htdocs/langs/mk_MK/commercial.lang
M htdocs/langs/mk_MK/holiday.lang
M htdocs/langs/mk_MK/mails.lang
M htdocs/langs/mk_MK/main.lang
M htdocs/langs/mk_MK/members.lang
M htdocs/langs/mk_MK/modulebuilder.lang
M htdocs/langs/mk_MK/projects.lang
M htdocs/langs/mk_MK/salaries.lang
M htdocs/langs/mk_MK/stocks.lang
M htdocs/langs/mk_MK/trips.lang
M htdocs/langs/mk_MK/website.lang
M htdocs/langs/mn_MN/admin.lang
M htdocs/langs/mn_MN/commercial.lang
M htdocs/langs/mn_MN/holiday.lang
M htdocs/langs/mn_MN/mails.lang
M htdocs/langs/mn_MN/main.lang
M htdocs/langs/mn_MN/members.lang
M htdocs/langs/mn_MN/modulebuilder.lang
M htdocs/langs/mn_MN/projects.lang
M htdocs/langs/mn_MN/salaries.lang
M htdocs/langs/mn_MN/stocks.lang
M htdocs/langs/mn_MN/trips.lang
M htdocs/langs/mn_MN/website.lang
M htdocs/langs/nb_NO/accountancy.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/agenda.lang
M htdocs/langs/nb_NO/banks.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nb_NO/commercial.lang
M htdocs/langs/nb_NO/companies.lang
M htdocs/langs/nb_NO/contracts.lang
M htdocs/langs/nb_NO/errors.lang
M htdocs/langs/nb_NO/holiday.lang
M htdocs/langs/nb_NO/interventions.lang
M htdocs/langs/nb_NO/ldap.lang
M htdocs/langs/nb_NO/mails.lang
M htdocs/langs/nb_NO/main.lang
M htdocs/langs/nb_NO/members.lang
M htdocs/langs/nb_NO/modulebuilder.lang
M htdocs/langs/nb_NO/multicurrency.lang
M htdocs/langs/nb_NO/opensurvey.lang
M htdocs/langs/nb_NO/other.lang
M htdocs/langs/nb_NO/products.lang
M htdocs/langs/nb_NO/projects.lang
M htdocs/langs/nb_NO/salaries.lang
M htdocs/langs/nb_NO/stocks.lang
M htdocs/langs/nb_NO/trips.lang
M htdocs/langs/nb_NO/users.lang
M htdocs/langs/nb_NO/website.lang
M htdocs/langs/nb_NO/withdrawals.lang
M htdocs/langs/nl_BE/main.lang
M htdocs/langs/nl_BE/website.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/commercial.lang
M htdocs/langs/nl_NL/holiday.lang
M htdocs/langs/nl_NL/mails.lang
M htdocs/langs/nl_NL/main.lang
M htdocs/langs/nl_NL/members.lang
M htdocs/langs/nl_NL/modulebuilder.lang
M htdocs/langs/nl_NL/projects.lang
M htdocs/langs/nl_NL/salaries.lang
M htdocs/langs/nl_NL/stocks.lang
M htdocs/langs/nl_NL/trips.lang
M htdocs/langs/nl_NL/website.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pl_PL/commercial.lang
M htdocs/langs/pl_PL/holiday.lang
M htdocs/langs/pl_PL/mails.lang
M htdocs/langs/pl_PL/main.lang
M htdocs/langs/pl_PL/members.lang
M htdocs/langs/pl_PL/modulebuilder.lang
M htdocs/langs/pl_PL/projects.lang
M htdocs/langs/pl_PL/salaries.lang
M htdocs/langs/pl_PL/stocks.lang
M htdocs/langs/pl_PL/trips.lang
M htdocs/langs/pl_PL/website.lang
M htdocs/langs/pt_BR/accountancy.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_BR/commercial.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_BR/members.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_BR/projects.lang
M htdocs/langs/pt_BR/trips.lang
M htdocs/langs/pt_BR/website.lang
M htdocs/langs/pt_PT/accountancy.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/pt_PT/agenda.lang
M htdocs/langs/pt_PT/boxes.lang
M htdocs/langs/pt_PT/commercial.lang
M htdocs/langs/pt_PT/companies.lang
M htdocs/langs/pt_PT/contracts.lang
M htdocs/langs/pt_PT/ecm.lang
M htdocs/langs/pt_PT/holiday.lang
M htdocs/langs/pt_PT/install.lang
M htdocs/langs/pt_PT/ldap.lang
M htdocs/langs/pt_PT/mails.lang
M htdocs/langs/pt_PT/main.lang
M htdocs/langs/pt_PT/members.lang
M htdocs/langs/pt_PT/modulebuilder.lang
M htdocs/langs/pt_PT/multicurrency.lang
M htdocs/langs/pt_PT/paybox.lang
M htdocs/langs/pt_PT/paypal.lang
M htdocs/langs/pt_PT/products.lang
M htdocs/langs/pt_PT/projects.lang
M htdocs/langs/pt_PT/salaries.lang
M htdocs/langs/pt_PT/sms.lang
M htdocs/langs/pt_PT/stocks.lang
M htdocs/langs/pt_PT/stripe.lang
M htdocs/langs/pt_PT/suppliers.lang
M htdocs/langs/pt_PT/trips.lang
M htdocs/langs/pt_PT/users.lang
M htdocs/langs/pt_PT/website.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ro_RO/commercial.lang
M htdocs/langs/ro_RO/holiday.lang
M htdocs/langs/ro_RO/mails.lang
M htdocs/langs/ro_RO/main.lang
M htdocs/langs/ro_RO/members.lang
M htdocs/langs/ro_RO/modulebuilder.lang
M htdocs/langs/ro_RO/projects.lang
M htdocs/langs/ro_RO/salaries.lang
M htdocs/langs/ro_RO/stocks.lang
M htdocs/langs/ro_RO/trips.lang
M htdocs/langs/ro_RO/website.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/ru_RU/commercial.lang
M htdocs/langs/ru_RU/holiday.lang
M htdocs/langs/ru_RU/mails.lang
M htdocs/langs/ru_RU/main.lang
M htdocs/langs/ru_RU/members.lang
M htdocs/langs/ru_RU/modulebuilder.lang
M htdocs/langs/ru_RU/projects.lang
M htdocs/langs/ru_RU/salaries.lang
M htdocs/langs/ru_RU/stocks.lang
M htdocs/langs/ru_RU/trips.lang
M htdocs/langs/ru_RU/website.lang
M htdocs/langs/sk_SK/admin.lang
M htdocs/langs/sk_SK/commercial.lang
M htdocs/langs/sk_SK/holiday.lang
M htdocs/langs/sk_SK/mails.lang
M htdocs/langs/sk_SK/main.lang
M htdocs/langs/sk_SK/members.lang
M htdocs/langs/sk_SK/modulebuilder.lang
M htdocs/langs/sk_SK/projects.lang
M htdocs/langs/sk_SK/salaries.lang
M htdocs/langs/sk_SK/stocks.lang
M htdocs/langs/sk_SK/trips.lang
M htdocs/langs/sk_SK/website.lang
M htdocs/langs/sl_SI/admin.lang
M htdocs/langs/sl_SI/commercial.lang
M htdocs/langs/sl_SI/holiday.lang
M htdocs/langs/sl_SI/mails.lang
M htdocs/langs/sl_SI/main.lang
M htdocs/langs/sl_SI/members.lang
M htdocs/langs/sl_SI/modulebuilder.lang
M htdocs/langs/sl_SI/projects.lang
M htdocs/langs/sl_SI/salaries.lang
M htdocs/langs/sl_SI/stocks.lang
M htdocs/langs/sl_SI/trips.lang
M htdocs/langs/sl_SI/website.lang
M htdocs/langs/sq_AL/admin.lang
M htdocs/langs/sq_AL/commercial.lang
M htdocs/langs/sq_AL/holiday.lang
M htdocs/langs/sq_AL/mails.lang
M htdocs/langs/sq_AL/main.lang
M htdocs/langs/sq_AL/members.lang
M htdocs/langs/sq_AL/modulebuilder.lang
M htdocs/langs/sq_AL/projects.lang
M htdocs/langs/sq_AL/salaries.lang
M htdocs/langs/sq_AL/stocks.lang
M htdocs/langs/sq_AL/trips.lang
M htdocs/langs/sq_AL/website.lang
M htdocs/langs/sr_RS/admin.lang
M htdocs/langs/sr_RS/commercial.lang
M htdocs/langs/sr_RS/holiday.lang
M htdocs/langs/sr_RS/mails.lang
M htdocs/langs/sr_RS/main.lang
M htdocs/langs/sr_RS/members.lang
M htdocs/langs/sr_RS/projects.lang
M htdocs/langs/sr_RS/salaries.lang
M htdocs/langs/sr_RS/stocks.lang
M htdocs/langs/sr_RS/trips.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/sv_SE/commercial.lang
M htdocs/langs/sv_SE/holiday.lang
M htdocs/langs/sv_SE/mails.lang
M htdocs/langs/sv_SE/main.lang
M htdocs/langs/sv_SE/members.lang
M htdocs/langs/sv_SE/modulebuilder.lang
M htdocs/langs/sv_SE/projects.lang
M htdocs/langs/sv_SE/salaries.lang
M htdocs/langs/sv_SE/stocks.lang
M htdocs/langs/sv_SE/trips.lang
M htdocs/langs/sv_SE/website.lang
M htdocs/langs/sw_SW/admin.lang
M htdocs/langs/sw_SW/commercial.lang
M htdocs/langs/sw_SW/holiday.lang
M htdocs/langs/sw_SW/mails.lang
M htdocs/langs/sw_SW/main.lang
M htdocs/langs/sw_SW/members.lang
M htdocs/langs/sw_SW/projects.lang
M htdocs/langs/sw_SW/salaries.lang
M htdocs/langs/sw_SW/stocks.lang
M htdocs/langs/sw_SW/trips.lang
M htdocs/langs/th_TH/admin.lang
M htdocs/langs/th_TH/commercial.lang
M htdocs/langs/th_TH/holiday.lang
M htdocs/langs/th_TH/mails.lang
M htdocs/langs/th_TH/main.lang
M htdocs/langs/th_TH/members.lang
M htdocs/langs/th_TH/modulebuilder.lang
M htdocs/langs/th_TH/projects.lang
M htdocs/langs/th_TH/salaries.lang
M htdocs/langs/th_TH/stocks.lang
M htdocs/langs/th_TH/trips.lang
M htdocs/langs/th_TH/website.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/commercial.lang
M htdocs/langs/tr_TR/holiday.lang
M htdocs/langs/tr_TR/mails.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/langs/tr_TR/members.lang
M htdocs/langs/tr_TR/modulebuilder.lang
M htdocs/langs/tr_TR/projects.lang
M htdocs/langs/tr_TR/salaries.lang
M htdocs/langs/tr_TR/stocks.lang
M htdocs/langs/tr_TR/trips.lang
M htdocs/langs/tr_TR/website.lang
M htdocs/langs/uk_UA/admin.lang
M htdocs/langs/uk_UA/commercial.lang
M htdocs/langs/uk_UA/holiday.lang
M htdocs/langs/uk_UA/mails.lang
M htdocs/langs/uk_UA/main.lang
M htdocs/langs/uk_UA/members.lang
M htdocs/langs/uk_UA/modulebuilder.lang
M htdocs/langs/uk_UA/projects.lang
M htdocs/langs/uk_UA/salaries.lang
M htdocs/langs/uk_UA/stocks.lang
M htdocs/langs/uk_UA/trips.lang
M htdocs/langs/uk_UA/website.lang
M htdocs/langs/uz_UZ/admin.lang
M htdocs/langs/uz_UZ/commercial.lang
M htdocs/langs/uz_UZ/holiday.lang
M htdocs/langs/uz_UZ/mails.lang
M htdocs/langs/uz_UZ/main.lang
M htdocs/langs/uz_UZ/members.lang
M htdocs/langs/uz_UZ/projects.lang
M htdocs/langs/uz_UZ/salaries.lang
M htdocs/langs/uz_UZ/stocks.lang
M htdocs/langs/uz_UZ/trips.lang
M htdocs/langs/vi_VN/admin.lang
M htdocs/langs/vi_VN/commercial.lang
M htdocs/langs/vi_VN/holiday.lang
M htdocs/langs/vi_VN/mails.lang
M htdocs/langs/vi_VN/main.lang
M htdocs/langs/vi_VN/members.lang
M htdocs/langs/vi_VN/modulebuilder.lang
M htdocs/langs/vi_VN/projects.lang
M htdocs/langs/vi_VN/salaries.lang
M htdocs/langs/vi_VN/stocks.lang
M htdocs/langs/vi_VN/trips.lang
M htdocs/langs/vi_VN/website.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_CN/commercial.lang
M htdocs/langs/zh_CN/holiday.lang
M htdocs/langs/zh_CN/mails.lang
M htdocs/langs/zh_CN/main.lang
M htdocs/langs/zh_CN/members.lang
M htdocs/langs/zh_CN/modulebuilder.lang
M htdocs/langs/zh_CN/projects.lang
M htdocs/langs/zh_CN/salaries.lang
M htdocs/langs/zh_CN/stocks.lang
M htdocs/langs/zh_CN/trips.lang
M htdocs/langs/zh_CN/website.lang
M htdocs/langs/zh_TW/admin.lang
M htdocs/langs/zh_TW/commercial.lang
M htdocs/langs/zh_TW/holiday.lang
M htdocs/langs/zh_TW/mails.lang
M htdocs/langs/zh_TW/main.lang
M htdocs/langs/zh_TW/members.lang
M htdocs/langs/zh_TW/modulebuilder.lang
M htdocs/langs/zh_TW/projects.lang
M htdocs/langs/zh_TW/salaries.lang
M htdocs/langs/zh_TW/stocks.lang
M htdocs/langs/zh_TW/trips.lang
M htdocs/langs/zh_TW/website.lang
M htdocs/main.inc.php
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/.gitattributes
M htdocs/modulebuilder/template/ChangeLog.md
M htdocs/modulebuilder/template/class/myobject.class.php
R htdocs/modulebuilder/template/dev/dolistore/README.md
R htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
R htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
R htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
R htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
R htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
R htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
R htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
R htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
R htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
R htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
R htdocs/modulebuilder/template/dev/dolistore/name-de.txt
R htdocs/modulebuilder/template/dev/dolistore/name-en.txt
R htdocs/modulebuilder/template/dev/dolistore/name-es.txt
R htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
R htdocs/modulebuilder/template/dev/dolistore/name-it.txt
R htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
R htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
R htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
R htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
R htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
M htdocs/modulebuilder/template/dev/git-hooks/post-commit
M htdocs/modulebuilder/template/dev/git-hooks/pre-commit
M htdocs/modulebuilder/template/dev/git-hooks/pre-push
R htdocs/modulebuilder/template/dev/newmodule.sh
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/modulebuilder/template/scripts/myobject.php
M htdocs/modulebuilder/template/sql/data.sql
A htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql
A htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
A htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.sql
R htdocs/modulebuilder/template/sql/llx_myobject.key.sql
R htdocs/modulebuilder/template/sql/llx_myobject.sql
R htdocs/modulebuilder/template/sql/llx_myobject_extrafields.sql
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/product/inventory/list.php
M htdocs/product/list.php
M htdocs/product/stock/productlot_list.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/list.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/time.php
M htdocs/public/payment/newpayment.php
M htdocs/public/stripe/newpayment.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
M htdocs/societe/list.php
M htdocs/societe/website.php
M htdocs/supplier_proposal/list.php
R htdocs/theme/eldy/img/off.png
R htdocs/theme/eldy/img/on.png
M htdocs/theme/eldy/style.css.php
R htdocs/theme/md/img/off.png
R htdocs/theme/md/img/on.png
M htdocs/theme/md/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/group/perms.php
M htdocs/user/index.php
M htdocs/user/perms.php
Log Message:
-----------
Merge remote-tracking branch 'uptream/develop' into
7.0-accountancyproductvariant
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Commit: 7e3103356ba8d3a41719df2f63961545aefe3365
https://github.com/Dolibarr/dolibarr/commit/7e3103356ba8d3a41719df2f63961545aefe3365
Author: Alexandre SPANGARO <address@hidden>
Date: 2017-11-04 (Sat, 04 Nov 2017)
Changed paths:
A dev/setup/apache/virtualhost
M htdocs/admin/system/web.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/viewcat.php
M htdocs/collab/index.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/cibles.php
M htdocs/core/actions_addupdatedelete.inc.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/lib/company.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/core/tpl/commonfields_add.tpl.php
M htdocs/core/tpl/commonfields_edit.tpl.php
M htdocs/core/tpl/commonfields_view.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_user.sql
M htdocs/install/mysql/tables/llx_website.sql
A htdocs/install/mysql/tables/llx_website_account.key.sql
A htdocs/install/mysql/tables/llx_website_account.sql
A htdocs/install/mysql/tables/llx_website_account_extrafields.key.sql
A htdocs/install/mysql/tables/llx_website_account_extrafields.sql
A htdocs/install/mysql/tables/llx_website_extrafields.key.sql
A htdocs/install/mysql/tables/llx_website_extrafields.sql
R htdocs/install/mysql/tables/llx_websiteaccount.key.sql
R htdocs/install/mysql/tables/llx_websiteaccount.sql
R htdocs/install/mysql/tables/llx_websiteaccount_extrafields.sql
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/website.lang
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/website.php
M htdocs/website/class/website.class.php
M htdocs/website/class/websiteaccount.class.php
M htdocs/website/class/websitepage.class.php
M htdocs/website/index.php
M htdocs/website/lib/websiteaccount.lib.php
M htdocs/website/websiteaccount_card.php
Log Message:
-----------
Merge remote-tracking branch 'uptream/develop' into
7.0-accountancyproductvariant
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Commit: fa999dfa65283ed9312b79b01720a8f30ac59bd3
https://github.com/Dolibarr/dolibarr/commit/fa999dfa65283ed9312b79b01720a8f30ac59bd3
Author: Laurent Destailleur <address@hidden>
Date: 2017-11-06 (Mon, 06 Nov 2017)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_product.sql
M htdocs/langs/en_US/products.lang
M htdocs/product/card.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant
NEW Accountancy Add variant on sell account for intracommunity sales & export
sales
Compare:
https://github.com/Dolibarr/dolibarr/compare/7139cbb4907e...fa999dfa6528
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] cc2609: Update database,
Laurent Destailleur <=