dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] e7e152: NEW Level multiprice generato


From: Juanjo Menent
Subject: [Dolibarr-git] [Dolibarr/dolibarr] e7e152: NEW Level multiprice generator based on per cent v...
Date: Sat, 31 Oct 2015 15:03:21 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e7e152c122873c46143d06dc64bf4ff21802b534
      
https://github.com/Dolibarr/dolibarr/commit/e7e152c122873c46143d06dc64bf4ff21802b534
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M htdocs/core/lib/product.lib.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_product.sql
    A htdocs/install/mysql/tables/llx_product_pricerules.key.sql
    A htdocs/install/mysql/tables/llx_product_pricerules.sql
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/products.lang
    A htdocs/product/admin/price_rules.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php

  Log Message:
  -----------
  NEW Level multiprice generator based on per cent variations over base price


  Commit: 6db09a0d649a0bbc6fc3b072fc747a3873700976
      
https://github.com/Dolibarr/dolibarr/commit/6db09a0d649a0bbc6fc3b072fc747a3873700976
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Little correction


  Commit: 1b10612c4bee864b25b94991c0a631c172d23957
      
https://github.com/Dolibarr/dolibarr/commit/1b10612c4bee864b25b94991c0a631c172d23957
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M htdocs/product/admin/price_rules.php

  Log Message:
  -----------
  Fixed PHPCS check


  Commit: c6baeacd3d6560e6d3c6f38bff6621839bba022d
      
https://github.com/Dolibarr/dolibarr/commit/c6baeacd3d6560e6d3c6f38bff6621839bba022d
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M htdocs/product/price.php

  Log Message:
  -----------
  Removed JS debugging


  Commit: eff1f7395027719f3061e38af38807bcefbe0116
      
https://github.com/Dolibarr/dolibarr/commit/eff1f7395027719f3061e38af38807bcefbe0116
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M .travis.yml
    M .tx/config
    M ChangeLog
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/fiscalyear_card.php
    M htdocs/accountancy/admin/importaccounts.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/journal.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/adherents/admin/adherent.php
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/card.php
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/ldap.php
    M htdocs/admin/agenda.php
    M htdocs/admin/agenda_extsites.php
    M htdocs/admin/agenda_xcal.php
    M htdocs/admin/askpricesupplier.php
    M htdocs/admin/bank.php
    M htdocs/admin/barcode.php
    M htdocs/admin/boxes.php
    M htdocs/admin/clicktodial.php
    M htdocs/admin/commande.php
    M htdocs/admin/company.php
    M htdocs/admin/compta.php
    M htdocs/admin/const.php
    M htdocs/admin/contract.php
    M htdocs/admin/dict.php
    M htdocs/admin/ihm.php
    M htdocs/admin/mailman.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/spip.php
    M htdocs/admin/system/about.php
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/admin/tools/export.php
    M htdocs/admin/tools/update.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    R htdocs/comm/list.php
    M htdocs/comm/propal.php
    R htdocs/comm/prospect/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/compta/recap-compta.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/list.php
    M htdocs/core/ajax/selectsearchbox.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/class/commondocgenerator.class.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.formfile.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    A htdocs/core/lib/hrm.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/login/functions_dolibarr.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    A htdocs/core/modules/modHRM.class.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expedition/shipment.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    R htdocs/fourn/list.php
    A htdocs/hrm/admin/admin_establishment.php
    A htdocs/hrm/admin/admin_hrm.php
    A htdocs/hrm/admin/index.html
    A htdocs/hrm/class/establishment.class.php
    A htdocs/hrm/class/index.html
    A htdocs/hrm/establishment/card.php
    A htdocs/hrm/establishment/index.html
    A htdocs/hrm/establishment/info.php
    A htdocs/hrm/index.html
    M htdocs/index.php
    M htdocs/install/doctemplates/invoices/template_invoice.odt
    A htdocs/install/mysql/data/llx_c_hrm_department.sql
    A htdocs/install/mysql/data/llx_c_hrm_function.sql
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    A htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm_resources.sql
    A htdocs/install/mysql/tables/llx_c_hrm_department.sql
    A htdocs/install/mysql/tables/llx_c_hrm_function.sql
    M htdocs/install/mysql/tables/llx_commande.sql
    M htdocs/install/mysql/tables/llx_ecm_directories.key.sql
    M htdocs/install/mysql/tables/llx_ecm_directories.sql
    M htdocs/install/mysql/tables/llx_ecm_files.key.sql
    M htdocs/install/mysql/tables/llx_ecm_files.sql
    A htdocs/install/mysql/tables/llx_establishment.sql
    M htdocs/install/mysql/tables/llx_projet_task_time.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/companies.lang
    A htdocs/langs/en_US/hrm.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/workflow.lang
    M htdocs/main.inc.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/document.php
    M htdocs/product/price.php
    M htdocs/projet/card.php
    M htdocs/public/test/test_forms.php
    M htdocs/societe/agenda.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/index.php
    M htdocs/societe/list.php
    M htdocs/societe/notify/card.php
    M htdocs/societe/price.php
    A htdocs/societe/project.php
    M htdocs/societe/soc.php
    A htdocs/theme/eldy/img/object_building.png
    M htdocs/theme/eldy/img/object_contact.png
    M htdocs/theme/eldy/img/object_group.png
    M htdocs/theme/eldy/img/object_user.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/img/filter.png
    A htdocs/theme/md/img/object_building.png
    M htdocs/theme/md/img/object_contact.png
    M htdocs/theme/md/img/object_group.png
    M htdocs/theme/md/img/object_user.png
    M htdocs/theme/md/img/search.png
    M htdocs/theme/md/img/searchclear.png
    M htdocs/theme/md/img/sort_asc.png
    M htdocs/theme/md/img/sort_desc.png
    M htdocs/theme/md/style.css.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/group/index.php
    M htdocs/user/hierarchy.php
    M htdocs/user/index.php

  Log Message:
  -----------
  Merge branch 'develop' into multiprice-generator

# Conflicts:
#       htdocs/install/mysql/migration/3.8.0-3.9.0.sql
#       htdocs/product/price.php


  Commit: e1f2efee4d6e45296ab0fb48d1a1535c6c57b7a3
      
https://github.com/Dolibarr/dolibarr/commit/e1f2efee4d6e45296ab0fb48d1a1535c6c57b7a3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-31 (Sat, 31 Oct 2015)

  Changed paths:
    M README.md
    M htdocs/admin/contract.php
    M htdocs/admin/events.php
    M htdocs/admin/expedition.php
    M htdocs/admin/expensereport.php
    M htdocs/admin/facture.php
    M htdocs/admin/fckeditor.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/geoipmaxmind.php
    M htdocs/admin/ldap.php
    M htdocs/admin/ldap_contacts.php
    M htdocs/admin/ldap_groups.php
    M htdocs/admin/ldap_members.php
    M htdocs/admin/ldap_users.php
    M htdocs/admin/limits.php
    M htdocs/admin/livraison.php
    M htdocs/admin/loan.php
    M htdocs/admin/mailing.php
    M htdocs/admin/mailman.php
    M htdocs/admin/mails.php
    M htdocs/admin/menus.php
    M htdocs/admin/modules.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/salaries.php
    M htdocs/admin/security.php
    M htdocs/admin/security_file.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/syslog.php
    M htdocs/admin/taxes.php
    M htdocs/barcode/codeinit.php
    M htdocs/barcode/printsheet.php
    M htdocs/bookmarks/admin/bookmark.php
    M htdocs/bookmarks/card.php
    M htdocs/bookmarks/list.php
    M htdocs/comm/propal/index.php
    M htdocs/commande/index.php
    M htdocs/contrat/index.php
    M htdocs/core/ajax/selectsearchbox.php
    M htdocs/core/boxes/box_task.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/exports/index.php
    M htdocs/fichinter/index.php
    M htdocs/fourn/commande/index.php
    M htdocs/fourn/commande/list.php
    M htdocs/hrm/admin/admin_establishment.php
    M htdocs/hrm/admin/admin_hrm.php
    A htdocs/hrm/class/employee.class.php
    A htdocs/hrm/employee/index.html
    A htdocs/hrm/employee/list.php
    M htdocs/install/mysql/data/llx_c_typent.sql
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    R htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    A htdocs/install/mysql/tables/llx_budget.sql
    A htdocs/install/mysql/tables/llx_budget_lines.key.sql
    A htdocs/install/mysql/tables/llx_budget_lines.sql
    M htdocs/install/mysql/tables/llx_c_forme_juridique.sql
    M htdocs/install/mysql/tables/llx_c_type_fees.sql
    M htdocs/install/mysql/tables/llx_c_typent.sql
    A htdocs/install/mysql/tables/llx_stock_lotserial.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/hrm.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/list.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/replenish.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/list.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/index.php

  Log Message:
  -----------
  Merge branch 'develop' into multiprice-generator

# Conflicts:
#       htdocs/install/mysql/migration/3.8.0-3.9.0.sql


  Commit: 592348850fa4a2cb63099d7189784113388d8762
      
https://github.com/Dolibarr/dolibarr/commit/592348850fa4a2cb63099d7189784113388d8762
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-31 (Sat, 31 Oct 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql

  Log Message:
  -----------
  Added missing SQL statements + reordered them


  Commit: a58b5f26f678b5ace70dc0d5cf92211cc5e6c6f1
      
https://github.com/Dolibarr/dolibarr/commit/a58b5f26f678b5ace70dc0d5cf92211cc5e6c6f1
  Author: Juanjo Menent <address@hidden>
  Date:   2015-10-31 (Sat, 31 Oct 2015)

  Changed paths:
    M htdocs/core/lib/product.lib.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_product.sql
    A htdocs/install/mysql/tables/llx_product_pricerules.key.sql
    A htdocs/install/mysql/tables/llx_product_pricerules.sql
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/products.lang
    A htdocs/product/admin/price_rules.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge pull request #3774 from marcosgdf/multiprice-generator

NEW Level multiprice generator based on per cent variations over base price


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fb03643f4248...a58b5f26f678

reply via email to

[Prev in Thread] Current Thread [Next in Thread]