[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] efbb05: PRODUIT_CUSTOMER_PRICES_BY_QT
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] efbb05: PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES |
|
Date: |
Fri, 25 May 2018 03:55:04 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: efbb053e54fffa154a7ed515a54ee12c946b4d1e
https://github.com/Dolibarr/dolibarr/commit/efbb053e54fffa154a7ed515a54ee12c946b4d1e
Author: Frédéric FRANCE <address@hidden>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M htdocs/comm/card.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
M htdocs/core/class/html.form.class.php
M htdocs/product/admin/product.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
Commit: 8547827575b9e7109d481d0234def5a4c65394e9
https://github.com/Dolibarr/dolibarr/commit/8547827575b9e7109d481d0234def5a4c65394e9
Author: Frédéric FRANCE <address@hidden>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M .tx/config
M ChangeLog
M build/generate_filelist_xml.php
M build/makepack-dolibarr.pl
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M dev/dolibarr_changes.txt
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/accountmodel.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/adherents/admin/website.php
M htdocs/admin/agenda_reminder.php
M htdocs/admin/agenda_xcal.php
M htdocs/admin/company.php
M htdocs/admin/expedition.php
M htdocs/admin/livraison.php
M htdocs/admin/mailing.php
M htdocs/admin/mailman.php
M htdocs/admin/mails.php
M htdocs/admin/mails_emailing.php
M htdocs/admin/mails_templates.php
M htdocs/admin/menus.php
M htdocs/admin/modulehelp.php
M htdocs/admin/notification.php
M htdocs/admin/payment.php
M htdocs/admin/prelevement.php
M htdocs/admin/propal.php
M htdocs/admin/proxy.php
M htdocs/admin/receiptprinter.php
M htdocs/admin/resource.php
M htdocs/admin/security.php
M htdocs/admin/security_other.php
M htdocs/admin/sms.php
M htdocs/admin/spip.php
M htdocs/admin/stock.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplier_payment.php
M htdocs/admin/supplier_proposal.php
M htdocs/admin/syslog.php
M htdocs/admin/system/filecheck.php
M htdocs/admin/usergroup.php
M htdocs/asset/class/asset.class.php
M htdocs/asset/class/asset_type.class.php
M htdocs/asset/type.php
M htdocs/bookmarks/admin/bookmark.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/categories/admin/categorie.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/index.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/rapport/index.php
M htdocs/comm/index.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/card.php
M htdocs/commande/list.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/ajaxpayment.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/api_invoices.class.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/compta/localtax/clients.php
A htdocs/compta/stats/byratecountry.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/casoc.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/index.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formaccounting.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/asset.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
M htdocs/core/modules/dons/modules_don.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/modAsset.class.php
M htdocs/core/modules/modDav.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/core/modules/modMultiCurrency.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modResource.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/core/modules/modTicketsup.class.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
A htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
A htdocs/core/modules/stock/doc/pdf_standard.modules.php
A htdocs/core/modules/stock/doc/pdf_stdmouvement.modules.php
A htdocs/core/modules/stock/modules_stock.class.php
A htdocs/core/modules/stock/modules_stock.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/core/tpl/ajaxrow.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/tpl/massactions_pre.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
M
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
M htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
M htdocs/cron/card.php
M htdocs/cron/list.php
M htdocs/don/card.php
M htdocs/don/class/don.class.php
M htdocs/expedition/card.php
M htdocs/expensereport/card.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/includes/jsgantt/jsgantt.js
M htdocs/install/mysql/data/llx_accounting_abc.sql
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/install/mysql/tables/llx_accounting_journal.key.sql
M htdocs/install/mysql/tables/llx_asset.key.sql
M htdocs/install/mysql/tables/llx_asset.sql
M htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
M htdocs/install/mysql/tables/llx_c_accounting_category.sql
M htdocs/install/mysql/tables/llx_entrepot.sql
M htdocs/install/mysql/tables/llx_stock_mouvement.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/assets.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/categories.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/install.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/install.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/livraison/card.php
M htdocs/main.inc.php
M htdocs/modulebuilder/template/class/myobject.class.php
R htdocs/modulebuilder/template/dev/codesniffer/DolibarrPSR2.xml
R htdocs/modulebuilder/template/dev/git-hooks/README
R htdocs/modulebuilder/template/dev/git-hooks/post-commit
R htdocs/modulebuilder/template/dev/git-hooks/pre-commit
R htdocs/modulebuilder/template/dev/git-hooks/pre-push
R htdocs/modulebuilder/template/dev/img/README.md
R htdocs/modulebuilder/template/dev/img/gfdl-129x44.png
R htdocs/modulebuilder/template/dev/img/gfdl-66x23.png
R htdocs/modulebuilder/template/dev/img/gfdl-logo.svg
R htdocs/modulebuilder/template/dev/img/gpl-v3-logo.svg
R htdocs/modulebuilder/template/dev/img/gplv3-127x51.png
R htdocs/modulebuilder/template/dev/img/gplv3-88x31.png
R htdocs/modulebuilder/template/dev/img/mymodule.svg
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/product/class/product.class.php
M htdocs/product/inventory/card.php
M htdocs/product/inventory/list.php
M htdocs/product/price.php
M htdocs/product/stock/card.php
M htdocs/product/stock/mouvement.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/contact.php
M htdocs/projet/element.php
M htdocs/projet/ganttview.php
M htdocs/projet/index.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/time.php
M htdocs/public/members/new.php
M htdocs/public/members/public_card.php
M htdocs/public/members/public_list.php
M htdocs/public/test/test_forms.php
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/contact.php
M htdocs/societe/paymentmodes.php
M htdocs/stripe/class/stripe.class.php
M htdocs/stripe/config.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/ticketsup/class/api_tickets.class.php
M htdocs/user/logout.php
M htdocs/variants/class/ProductCombination.class.php
M htdocs/variants/generator.php
M htdocs/website/index.php
A test/phpunit/AccountingAccountTest.php
M test/phpunit/AllTests.php
M test/phpunit/CommandeTest.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into multipriceqty
Commit: 0623ff7667707802c66ff2e127c6e484a41605d4
https://github.com/Dolibarr/dolibarr/commit/0623ff7667707802c66ff2e127c6e484a41605d4
Author: Frédéric FRANCE <address@hidden>
Date: 2018-05-24 (Thu, 24 May 2018)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
fix logic
Commit: 823936ef8799682ddcd03557bc60f8ad948e7d8a
https://github.com/Dolibarr/dolibarr/commit/823936ef8799682ddcd03557bc60f8ad948e7d8a
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-25 (Fri, 25 May 2018)
Changed paths:
M htdocs/comm/card.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
M htdocs/core/class/html.form.class.php
M htdocs/product/admin/product.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge pull request #8847 from frederic34/multipriceqty
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
Compare:
https://github.com/Dolibarr/dolibarr/compare/46d98febbeec...823936ef8799
**NOTE:** This service 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] efbb05: PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES,
Laurent Destailleur <=