dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] 7262f8: Merge remote-tracking branch


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 7262f8: Merge remote-tracking branch 'refs/remotes/Dolibar...
Date: Mon, 05 Mar 2018 11:47:05 -0800

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7262f8901678f7a634a57fa33c81c5eec9298eff
      
https://github.com/Dolibarr/dolibarr/commit/7262f8901678f7a634a57fa33c81c5eec9298eff
  Author: fappels <address@hidden>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M ChangeLog
    M build/debian/patches/use-etc-dolibarr-conf.patch
    M build/debian/rules
    M build/makepack-dolibarr.pl
    M build/rpm/dolibarr-forrpm.patch
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/httpd-dolibarr.conf
    M dev/initdemo/initdemo.sh
    M htdocs/accountancy/admin/categories_list.php
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/expensereport/lines.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    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/class/adherent_type.class.php
    M htdocs/adherents/class/api_memberstypes.class.php
    M htdocs/adherents/index.php
    M htdocs/adherents/list.php
    M htdocs/adherents/type.php
    M htdocs/admin/agenda.php
    M htdocs/admin/agenda_extrafields.php
    M htdocs/admin/agenda_extsites.php
    M htdocs/admin/agenda_other.php
    M htdocs/admin/agenda_reminder.php
    M htdocs/admin/agenda_xcal.php
    M htdocs/admin/bank.php
    M htdocs/admin/bank_extrafields.php
    M htdocs/admin/barcode.php
    M htdocs/admin/chequereceipts.php
    M htdocs/admin/clicktodial.php
    M htdocs/admin/commande.php
    M htdocs/admin/compta.php
    M htdocs/admin/confexped.php
    M htdocs/admin/contract.php
    M htdocs/admin/ecm.php
    M htdocs/admin/events.php
    M htdocs/admin/expedition.php
    M htdocs/admin/expedition_extrafields.php
    M htdocs/admin/expeditiondet_extrafields.php
    M htdocs/admin/expensereport.php
    M htdocs/admin/expensereport_extrafields.php
    M htdocs/admin/expensereport_ik.php
    M htdocs/admin/expensereport_rules.php
    M htdocs/admin/external_rss.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_members_types.php
    M htdocs/admin/ldap_users.php
    M htdocs/admin/livraison.php
    M htdocs/admin/livraison_extrafields.php
    M htdocs/admin/livraisondet_extrafields.php
    M htdocs/admin/loan.php
    M htdocs/admin/mailing.php
    M htdocs/admin/mailman.php
    M htdocs/admin/mails.php
    M htdocs/admin/modules.php
    M htdocs/admin/multicurrency.php
    M htdocs/admin/notification.php
    M htdocs/admin/oauth.php
    M htdocs/admin/oauthlogintokens.php
    M htdocs/admin/order_extrafields.php
    M htdocs/admin/orderdet_extrafields.php
    M htdocs/admin/payment.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/propal.php
    M htdocs/admin/receiptprinter.php
    M htdocs/admin/resource.php
    M htdocs/admin/resource_extrafields.php
    M htdocs/admin/salaries.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/supplierinvoice_extrafields.php
    M htdocs/admin/supplierinvoicedet_extrafields.php
    M htdocs/admin/supplierorder_extrafields.php
    M htdocs/admin/supplierorderdet_extrafields.php
    M htdocs/admin/syslog.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/admin/taxes.php
    M htdocs/admin/tools/purge.php
    M htdocs/admin/usergroup.php
    M htdocs/admin/workflow.php
    M htdocs/api/admin/explorer.php
    M htdocs/api/admin/index.php
    M htdocs/barcode/codeinit.php
    M htdocs/bookmarks/admin/bookmark.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/admin/categorie.php
    M htdocs/categories/admin/categorie_extrafields.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/admin/propal_extrafields.php
    M htdocs/comm/admin/propaldet_extrafields.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/comm/propal/card.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/index.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/transfer.php
    M htdocs/compta/facture/admin/facture_cust_extrafields.php
    M htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
    M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
    M htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/invoicetemplate_list.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement/card.php
    M htdocs/compta/paiement/cheque/card.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/paiement/cheque/index.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/list.php
    M htdocs/compta/recap-compta.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/contrat/admin/contract_extrafields.php
    M htdocs/contrat/admin/contractdet_extrafields.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/services_list.php
    M htdocs/contrat/tpl/linkedobjectblock.tpl.php
    M htdocs/core/actions_linkedfiles.inc.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/boxes/box_members.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/lib/resource.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/lib/website.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    M htdocs/core/modules/dons/html_cerfafr.html
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modBlockedLog.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modWebsite.class.php
    M htdocs/core/modules/oauth/github_oauthcallback.php
    M htdocs/core/modules/oauth/google_oauthcallback.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.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/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
    M htdocs/core/tpl/ajaxrow.tpl.php
    M htdocs/core/tpl/card_presend.tpl.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/core/tpl/extrafields_view.tpl.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/cron/admin/cron.php
    M htdocs/cron/card.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/cron/info.php
    M htdocs/cron/list.php
    M htdocs/don/admin/donation.php
    M htdocs/don/admin/donation_extrafields.php
    M htdocs/don/card.php
    M htdocs/don/class/don.class.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expensereport/card.php
    M htdocs/externalsite/admin/externalsite.php
    M htdocs/fichinter/admin/fichinter_extrafields.php
    M htdocs/fichinter/admin/fichinterdet_extrafields.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/class/api_interventions.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.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/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/ftp/admin/ftpclient.php
    M htdocs/holiday/card.php
    M htdocs/holiday/define_holiday.php
    M htdocs/hrm/admin/admin_establishment.php
    M htdocs/hrm/admin/admin_hrm.php
    M htdocs/hrm/index.php
    M htdocs/imports/import.php
    M htdocs/install/check.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/install/mysql/tables/llx_don.sql
    M htdocs/install/mysql/tables/llx_expensereport_rules.sql
    M htdocs/install/repair.php
    M htdocs/install/step1.php
    M htdocs/install/step5.php
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_AU/main.lang
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/ecm.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/en_US/main.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/es_EC/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/bills.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/es_ES/ecm.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/es_ES/salaries.lang
    M htdocs/langs/es_ES/users.lang
    M htdocs/langs/fr_FR/accountancy.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/ecm.lang
    M htdocs/langs/fr_FR/interventions.lang
    M htdocs/langs/fr_FR/mails.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/modulebuilder.lang
    M htdocs/langs/fr_FR/multicurrency.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/langs/fr_FR/printing.lang
    M htdocs/langs/fr_FR/salaries.lang
    M htdocs/langs/fr_FR/trips.lang
    M htdocs/langs/fr_FR/users.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/compta.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/pt_BR/accountancy.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/boxes.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/compta.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/cron.lang
    M htdocs/langs/pt_BR/deliveries.lang
    M htdocs/langs/pt_BR/dict.lang
    M htdocs/langs/pt_BR/ecm.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/holiday.lang
    M htdocs/langs/pt_BR/install.lang
    M htdocs/langs/pt_BR/interventions.lang
    M htdocs/langs/pt_BR/languages.lang
    M htdocs/langs/pt_BR/ldap.lang
    M htdocs/langs/pt_BR/loan.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/margins.lang
    M htdocs/langs/pt_BR/members.lang
    M htdocs/langs/pt_BR/oauth.lang
    M htdocs/langs/pt_BR/opensurvey.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/paybox.lang
    M htdocs/langs/pt_BR/paypal.lang
    M htdocs/langs/pt_BR/productbatch.lang
    M htdocs/langs/pt_BR/propal.lang
    M htdocs/langs/pt_BR/resource.lang
    M htdocs/langs/pt_BR/sendings.lang
    M htdocs/langs/pt_BR/sms.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/bills.lang
    M htdocs/langs/pt_PT/companies.lang
    M htdocs/langs/pt_PT/compta.lang
    M htdocs/langs/pt_PT/ecm.lang
    M htdocs/langs/pt_PT/interventions.lang
    M htdocs/langs/pt_PT/loan.lang
    M htdocs/langs/pt_PT/main.lang
    M htdocs/langs/pt_PT/trips.lang
    M htdocs/langs/pt_PT/withdrawals.lang
    M htdocs/langs/pt_PT/workflow.lang
    M htdocs/livraison/card.php
    M htdocs/margin/admin/margin.php
    M htdocs/modulebuilder/template/admin/about.php
    M htdocs/modulebuilder/template/admin/setup.php
    M htdocs/modulebuilder/template/class/myobject.class.php
    M htdocs/modulebuilder/template/myobject_card.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/paybox/admin/paybox.php
    M htdocs/paypal/admin/paypal.php
    M htdocs/printing/admin/printing.php
    M htdocs/product/admin/dynamic_prices.php
    M htdocs/product/admin/price_rules.php
    M htdocs/product/admin/product.php
    M htdocs/product/admin/product_extrafields.php
    M htdocs/product/admin/product_lot_extrafields.php
    M htdocs/product/card.php
    M htdocs/product/composition/card.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/list.php
    M htdocs/product/stock/card.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/admin/project_extrafields.php
    M htdocs/projet/admin/project_task_extrafields.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/element.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/comment.php
    M htdocs/projet/tasks/contact.php
    M htdocs/projet/tasks/document.php
    M htdocs/projet/tasks/note.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php
    M htdocs/societe/admin/contact_extrafields.php
    M htdocs/societe/admin/societe.php
    M htdocs/societe/admin/societe_extrafields.php
    M htdocs/societe/card.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/index.php
    M htdocs/societe/list.php
    M htdocs/societe/societecontact.php
    M htdocs/stripe/admin/stripe.php
    M htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
    M htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/supplier_proposal/list.php
    M htdocs/support/inc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/admin/group_extrafields.php
    M htdocs/user/admin/user_extrafields.php
    M htdocs/user/card.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/group/card.php
    M htdocs/user/group/index.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M htdocs/variants/admin/admin.php
    M htdocs/webservices/admin/index.php
    M htdocs/website/class/websitepage.class.php
    M htdocs/website/index.php
    M test/phpunit/CodingPhpTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/Dolibarr/7.0' into 
7.0_fix_insert_expedition_line


  Commit: 1a7c09b7d5e6dc76c17d7f1ef88385afd68eedfd
      
https://github.com/Dolibarr/dolibarr/commit/1a7c09b7d5e6dc76c17d7f1ef88385afd68eedfd
  Author: fappels <address@hidden>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

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

  Log Message:
  -----------
  Fix 0 is also a valid Qty

Fix error handling


  Commit: 81e193b725b8df2b930bbd76792bdf3bc76cb620
      
https://github.com/Dolibarr/dolibarr/commit/81e193b725b8df2b930bbd76792bdf3bc76cb620
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

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

  Log Message:
  -----------
  Update expedition.class.php


  Commit: 5de43d6652e0afaeebd1517b9ce56d5f0c36c400
      
https://github.com/Dolibarr/dolibarr/commit/5de43d6652e0afaeebd1517b9ce56d5f0c36c400
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

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

  Log Message:
  -----------
  Merge pull request #8273 from fappels/7.0_fix_insert_expedition_line

 Fix shipment line insert


Compare: 
https://github.com/Dolibarr/dolibarr/compare/951babae6def...5de43d6652e0

reply via email to

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