[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2ef0e9: New: works with variants:
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2ef0e9: New: works with variants: |
Date: |
Tue, 16 Oct 2018 11:08:19 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 2ef0e95586410cf7bf840ccb25cd9fc5f4f1c372
https://github.com/Dolibarr/dolibarr/commit/2ef0e95586410cf7bf840ccb25cd9fc5f4f1c372
Author: Juanjo Menent <address@hidden>
Date: 2018-10-11 (Thu, 11 Oct 2018)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/stock/product.php
M htdocs/variants/class/ProductCombination.class.php
Log Message:
-----------
New: works with variants:
- If product is parent showing stock of childs and not itself
- Add function hasVariants for know if product has variants
Commit: 58be4ac7a32836d28d7a1df033ba57f02225ebda
https://github.com/Dolibarr/dolibarr/commit/58be4ac7a32836d28d7a1df033ba57f02225ebda
Author: Juanjo Menent <address@hidden>
Date: 2018-10-11 (Thu, 11 Oct 2018)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
New: works with variants:
- Hide child products into list if PRODUIT_ATTRIBUTES_HIDECHILD is activated
Commit: ab55ff2e2c71218ba84ca6683e64169615620acd
https://github.com/Dolibarr/dolibarr/commit/ab55ff2e2c71218ba84ca6683e64169615620acd
Author: Juanjo Menent <address@hidden>
Date: 2018-10-11 (Thu, 11 Oct 2018)
Changed paths:
M htdocs/langs/en_US/products.lang
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/stock/product.php
M htdocs/variants/class/ProductCombination.class.php
Log Message:
-----------
New: works with variants:
- Make the checkbox working correctly
Commit: 0976616401c424a0a5fb3a3faa76f37c65915d67
https://github.com/Dolibarr/dolibarr/commit/0976616401c424a0a5fb3a3faa76f37c65915d67
Author: Juanjo Menent <address@hidden>
Date: 2018-10-11 (Thu, 11 Oct 2018)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: Opening brace should be on a new line
Commit: e3643c7ab756c76e78d6c54a30d296e26c35fa44
https://github.com/Dolibarr/dolibarr/commit/e3643c7ab756c76e78d6c54a30d296e26c35fa44
Author: Juanjo Menent <address@hidden>
Date: 2018-10-15 (Mon, 15 Oct 2018)
Changed paths:
M doc/images/dolibarr_screenshot5_1920x1080_b.jpg
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/index.php
M htdocs/accountancy/tpl/export_journal.tpl.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/facture.php
M htdocs/admin/tools/dolibarr_export.php
A htdocs/admin/tools/export_files.php
M htdocs/asset/admin/assets_extrafields.php
M htdocs/asset/admin/assets_type_extrafields.php
M htdocs/asset/admin/setup.php
M htdocs/asset/card.php
M htdocs/asset/document.php
M htdocs/asset/info.php
M htdocs/asset/note.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/list.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/asset.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
M htdocs/core/website.inc.php
M htdocs/datapolicies/class/actions_datapolicies.class.php
M htdocs/datapolicies/lib/datapolicies.lib.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/banks.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/blockedlog.lang
M htdocs/langs/en_US/boxes.lang
M htdocs/langs/en_US/commercial.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/cron.lang
M htdocs/langs/en_US/deliveries.lang
M htdocs/langs/en_US/dict.lang
M htdocs/langs/en_US/donations.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/exports.lang
M htdocs/langs/en_US/externalsite.lang
M htdocs/langs/en_US/ftp.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/en_US/install.lang
M htdocs/langs/en_US/ldap.lang
M htdocs/langs/en_US/link.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/multicurrency.lang
M htdocs/langs/en_US/opensurvey.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/paybox.lang
M htdocs/langs/en_US/paypal.lang
M htdocs/langs/en_US/productbatch.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/propal.lang
M htdocs/langs/en_US/salaries.lang
M htdocs/langs/en_US/sendings.lang
M htdocs/langs/en_US/sms.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/en_US/users.lang
M htdocs/langs/en_US/website.lang
M htdocs/langs/en_US/withdrawals.lang
M htdocs/langs/en_US/workflow.lang
M htdocs/langs/fr_FR/users.lang
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/product/class/product.class.php
M htdocs/product/stock/mouvement.php
M htdocs/projet/card.php
M htdocs/public/payment/newpayment.php
M htdocs/public/website/index.php
M htdocs/societe/card.php
M htdocs/societe/index.php
M htdocs/stripe/class/stripe.class.php
M htdocs/stripe/config.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/website/class/website.class.php
M htdocs/website/class/websitepage.class.php
M htdocs/website/index.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: c2814948fbf51f9095956eff7bb584bb5b346127
https://github.com/Dolibarr/dolibarr/commit/c2814948fbf51f9095956eff7bb584bb5b346127
Author: Juanjo Menent <address@hidden>
Date: 2018-10-15 (Mon, 15 Oct 2018)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Fix: name of fields used into the search criteria must always start with
"search_"
Commit: 58cc9aa918435603a8c68cab0f813ed2aeaed8e4
https://github.com/Dolibarr/dolibarr/commit/58cc9aa918435603a8c68cab0f813ed2aeaed8e4
Author: Juanjo Menent <address@hidden>
Date: 2018-10-15 (Mon, 15 Oct 2018)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: found 1 blank lines before brace
Commit: 194b3478f3c63ffe0bad32690cabef2ada493015
https://github.com/Dolibarr/dolibarr/commit/194b3478f3c63ffe0bad32690cabef2ada493015
Author: Juanjo Menent <address@hidden>
Date: 2018-10-15 (Mon, 15 Oct 2018)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts:
# htdocs/product/class/product.class.php
Commit: d43e1fcef6ea8e2f427a1f2af704a4c1f6cfb2ff
https://github.com/Dolibarr/dolibarr/commit/d43e1fcef6ea8e2f427a1f2af704a4c1f6cfb2ff
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-16 (Tue, 16 Oct 2018)
Changed paths:
M htdocs/langs/en_US/products.lang
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/stock/product.php
M htdocs/variants/class/ProductCombination.class.php
Log Message:
-----------
Merge pull request #9729 from simnandez/develop
New: works with variants
Compare:
https://github.com/Dolibarr/dolibarr/compare/f07096ea3aff...d43e1fcef6ea
**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] 2ef0e9: New: works with variants:,
Laurent Destailleur <=