[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 9a1588: Add missing $mode in BookKeep
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 9a1588: Add missing $mode in BookKeeping::createStd() |
|
Date: |
Wed, 14 Mar 2018 17:57:48 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 9a1588df1385567b527c1f78d3ed32637c925ca6
https://github.com/Dolibarr/dolibarr/commit/9a1588df1385567b527c1f78d3ed32637c925ca6
Author: Sean Wang <address@hidden>
Date: 2018-03-14 (Wed, 14 Mar 2018)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
Log Message:
-----------
Add missing $mode in BookKeeping::createStd()
In accountancy ledger, creating new transaction, there is
'ERROR: 55000: currval of sequence "llx_accounting_bookkeeping_rowid_seq"
is not yet defined in this session' occurred.
According to dolibarr.log, this error will show up after
createStd() {...Insert request to llx_accounting_bookkeeping_tmp...}.
It query the "llx_accounting_bookkeeping_rowid_seq" instead of
"llx_accounting_bookkeeping_tmp_rowid_seq",
due to missing $mode at bookkeeping.class.php
line504:last_insert_id().
Commit: 304595ee4f91c0bae0f4aa1e4403d05b692ccc65
https://github.com/Dolibarr/dolibarr/commit/304595ee4f91c0bae0f4aa1e4403d05b692ccc65
Author: Ferran Marcet <address@hidden>
Date: 2018-03-14 (Wed, 14 Mar 2018)
Changed paths:
M htdocs/projet/admin/project.php
Log Message:
-----------
Fix: Can't activate tasks on projects configuration
Commit: e7a315958dac49d6e4e456629cf943cd560f0724
https://github.com/Dolibarr/dolibarr/commit/e7a315958dac49d6e4e456629cf943cd560f0724
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-14 (Wed, 14 Mar 2018)
Changed paths:
M htdocs/projet/admin/project.php
Log Message:
-----------
Merge pull request #8381 from fmarcet/7.0
FIX Can't activate tasks on projects configuration
Commit: e47dda72e7f2fc99f33860f847b89801ca09ae85
https://github.com/Dolibarr/dolibarr/commit/e47dda72e7f2fc99f33860f847b89801ca09ae85
Author: Ferran Marcet <address@hidden>
Date: 2018-03-14 (Wed, 14 Mar 2018)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
Fix: Activate all also if there are inactive services
Commit: 4d4a204f7f7b273611e727ccb563a27667c45434
https://github.com/Dolibarr/dolibarr/commit/4d4a204f7f7b273611e727ccb563a27667c45434
Author: Ferran Marcet <address@hidden>
Date: 2018-03-14 (Wed, 14 Mar 2018)
Changed paths:
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/admin/journals_list.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/customer/lines.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/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/card.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/adherents/class/subscription.class.php
M htdocs/adherents/index.php
M htdocs/adherents/list.php
M htdocs/adherents/subscription.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/company.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/dbtable.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/blockedlog/admin/blockedlog_list.php
M htdocs/blockedlog/ajax/block-info.php
M htdocs/blockedlog/class/blockedlog.class.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/action/class/actioncomm.class.php
M htdocs/comm/action/class/api_agendaevents.class.php
M htdocs/comm/action/index.php
M htdocs/comm/action/list.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/admin/propaldet_extrafields.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/list.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/recap-compta.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/compta/tva/quadri_detail.php
M htdocs/contact/class/contact.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/core/actions_addupdatedelete.inc.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/boxes/box_commandes.php
M htdocs/core/boxes/box_contracts.php
M htdocs/core/boxes/box_members.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/boxes/box_propales.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/boxes/box_services_expired.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/comment.class.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.formcompany.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/utils.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/resource.lib.php
M htdocs/core/lib/website.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/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/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
M htdocs/core/modules/mailings/advthirdparties.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modSociete.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/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
M htdocs/core/tpl/bloc_comment.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/extrafields_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/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/expensereport/class/expensereport.class.php
M htdocs/expensereport/note.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/filefunc.inc.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.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/mysql/data/llx_c_action_trigger.sql
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/step1.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/ecm.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/en_US/users.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/livraison/card.php
M htdocs/loan/card.php
M htdocs/loan/createschedule.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/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/class/product.class.php
M htdocs/product/composition/card.php
M htdocs/product/inventory/card.php
M htdocs/product/inventory/list.php
M htdocs/product/list.php
M htdocs/product/stock/card.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.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/class/task.class.php
M htdocs/projet/element.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/public/paybox/paymentok.php
M htdocs/public/payment/paymentok.php
M htdocs/public/paypal/paymentok.php
M htdocs/public/stripe/paymentok.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/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/user.class.php
M htdocs/user/group/card.php
M htdocs/user/home.php
M htdocs/user/index.php
M htdocs/variants/admin/admin.php
M htdocs/variants/combinations.php
M htdocs/webservices/admin/index.php
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/7.0' into 7.0
Commit: 5140c1c5d2002451cedf88aebc6848a6ba6e316a
https://github.com/Dolibarr/dolibarr/commit/5140c1c5d2002451cedf88aebc6848a6ba6e316a
Author: fmarcet <address@hidden>
Date: 2018-03-14 (Wed, 14 Mar 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
Fix: Merge categories when merging thirds
Commit: ffc91bdfdf97caa733419ae86ee1aab996c076a6
https://github.com/Dolibarr/dolibarr/commit/ffc91bdfdf97caa733419ae86ee1aab996c076a6
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-15 (Thu, 15 Mar 2018)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
Log Message:
-----------
Merge pull request #8383 from ggg44473/7.0
Add missing $mode in BookKeeping::createStd()
Commit: c69f5843da46934c9a83e4ac2b72d42815587576
https://github.com/Dolibarr/dolibarr/commit/c69f5843da46934c9a83e4ac2b72d42815587576
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-15 (Thu, 15 Mar 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
Update card.php
Commit: 14a33af60355193a098872be70be16de0f0572c9
https://github.com/Dolibarr/dolibarr/commit/14a33af60355193a098872be70be16de0f0572c9
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-15 (Thu, 15 Mar 2018)
Changed paths:
M htdocs/contrat/card.php
M htdocs/societe/card.php
Log Message:
-----------
Merge pull request #8384 from fmarcet/7.0
FIX Activate all also if there are inactive services
Commit: 6a70d268e0f25c7e0d565957a9437c2af6d8eab6
https://github.com/Dolibarr/dolibarr/commit/6a70d268e0f25c7e0d565957a9437c2af6d8eab6
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-15 (Thu, 15 Mar 2018)
Changed paths:
M htdocs/core/lib/functions2.lib.php
M htdocs/societe/card.php
Log Message:
-----------
Fix SQLi reported by op7ica
Commit: 4957ea91782c8d3a72eebfdac91d88a970b53afd
https://github.com/Dolibarr/dolibarr/commit/4957ea91782c8d3a72eebfdac91d88a970b53afd
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-15 (Thu, 15 Mar 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/list.php
M htdocs/admin/company.php
M htdocs/bookmarks/card.php
M htdocs/compta/stats/casoc.php
M htdocs/langs/en_US/categories.lang
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix SQLi reported by op7ica
Commit: 852bf8dab730dfd26dc8bfbb11492eba1be0c2e0
https://github.com/Dolibarr/dolibarr/commit/852bf8dab730dfd26dc8bfbb11492eba1be0c2e0
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-15 (Thu, 15 Mar 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/company.php
M htdocs/bookmarks/card.php
M htdocs/compta/stats/casoc.php
M htdocs/contrat/card.php
M htdocs/langs/en_US/categories.lang
M htdocs/projet/admin/project.php
M htdocs/societe/card.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/f0f6f71161e6...852bf8dab730