[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c45b19: FIX: when STOCK_CALCULATE_ON_
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c45b19: FIX: when STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set... |
|
Date: |
Thu, 18 Jul 2019 09:23:29 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c45b191330951781f18b5fcee91fae7b5a0755f9
https://github.com/Dolibarr/dolibarr/commit/c45b191330951781f18b5fcee91fae7b5a0755f9
Author: atm-florian.m <address@hidden>
Date: 2019-07-01 (Mon, 01 Jul 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX: when STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set, deleting a "closed"
shipment now increases stock as expected
Commit: 64d1ebf59cd6ee27117cca10fc552257d0e17ea4
https://github.com/Dolibarr/dolibarr/commit/64d1ebf59cd6ee27117cca10fc552257d0e17ea4
Author: atm-florian.m <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/langs/fr_FR/sendings.lang
Log Message:
-----------
FIX: on shipment delete confirm dialog, a new checkbox allows the user to
choose if they want their stock re-incremented after the deletion.
Commit: 8030735ded5f9acd0531fc581c7cd987438ebd5e
https://github.com/Dolibarr/dolibarr/commit/8030735ded5f9acd0531fc581c7cd987438ebd5e
Author: atm-florian.m <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M ChangeLog
M build/generate_filelist_xml.php
M build/makepack-dolibarr.pl
M htdocs/adherents/class/adherent.class.php
M htdocs/compta/prelevement/factures.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/extrafieldsinexport.inc.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/tpl/massactions_pre.tpl.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expensereport/card.php
M htdocs/fichinter/list.php
M htdocs/filefunc.inc.php
M htdocs/holiday/card.php
M htdocs/langs/fr_FR/sendings.lang
Log Message:
-----------
Merge branch
'FIX_add_checkbox_on_shipment_delete_confirm_dialog_to_ask_if_stock_should_be_incremented'
into
FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set
(taking PR comments into account)
Commit: 4f0316580672122e1154c148935d5e17264ad433
https://github.com/Dolibarr/dolibarr/commit/4f0316580672122e1154c148935d5e17264ad433
Author: atm-florian.m <address@hidden>
Date: 2019-07-11 (Thu, 11 Jul 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX: outdated phpdoc
Commit: 294bc5dcb5e0fedca685b6976e4d7e042fa03067
https://github.com/Dolibarr/dolibarr/commit/294bc5dcb5e0fedca685b6976e4d7e042fa03067
Author: Regis Houssin <address@hidden>
Date: 2019-07-15 (Mon, 15 Jul 2019)
Changed paths:
M htdocs/commande/card.php
M htdocs/core/tpl/object_discounts.tpl.php
Log Message:
-----------
FIX avoid conflict with "$classname" in card.php
Commit: ae540cb25e5b6b671258f2c4ae71b2c5bca5d4ee
https://github.com/Dolibarr/dolibarr/commit/ae540cb25e5b6b671258f2c4ae71b2c5bca5d4ee
Author: atm-florian.m <address@hidden>
Date: 2019-07-15 (Mon, 15 Jul 2019)
Changed paths:
M htdocs/fourn/product/list.php
Log Message:
-----------
FIX: add missing hook calls
Commit: 8aa147a4e518f7b1a4ba203c7825bcc8e82b2d79
https://github.com/Dolibarr/dolibarr/commit/8aa147a4e518f7b1a4ba203c7825bcc8e82b2d79
Author: atm-florian.m <address@hidden>
Date: 2019-07-15 (Mon, 15 Jul 2019)
Changed paths:
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/product/list.php
Log Message:
-----------
# missing hooks from dispatch.php and list.php
Commit: 41d9e93b3fc13d14abb000e221b4e3d9124d20d6
https://github.com/Dolibarr/dolibarr/commit/41d9e93b3fc13d14abb000e221b4e3d9124d20d6
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-15 (Mon, 15 Jul 2019)
Changed paths:
M htdocs/commande/card.php
M htdocs/core/tpl/object_discounts.tpl.php
Log Message:
-----------
Merge pull request #11510 from hregis/9.0_bug2
FIX avoid conflict with "$classname" in card.php
Commit: 6c23154a91f683f300bac2b114acce2aa4c2d201
https://github.com/Dolibarr/dolibarr/commit/6c23154a91f683f300bac2b114acce2aa4c2d201
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-15 (Mon, 15 Jul 2019)
Changed paths:
M htdocs/accountancy/admin/journals_list.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
FIX #11506
Commit: ea349de0818dddff6859aaca349d0878d9a57cf3
https://github.com/Dolibarr/dolibarr/commit/ea349de0818dddff6859aaca349d0878d9a57cf3
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-15 (Mon, 15 Jul 2019)
Changed paths:
M dev/dolibarr_changes.txt
M htdocs/includes/mike42/escpos-php/Escpos.php
Log Message:
-----------
FIX #11498
Commit: d694360c66bea525997c471f535948864574ece4
https://github.com/Dolibarr/dolibarr/commit/d694360c66bea525997c471f535948864574ece4
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-15 (Mon, 15 Jul 2019)
Changed paths:
M htdocs/core/modules/modAgenda.class.php
Log Message:
-----------
Fix warning
Commit: 5d74c81941faa613a030a1e30a48d270ae2cebf3
https://github.com/Dolibarr/dolibarr/commit/5d74c81941faa613a030a1e30a48d270ae2cebf3
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-15 (Mon, 15 Jul 2019)
Changed paths:
M htdocs/commande/card.php
M htdocs/core/tpl/object_discounts.tpl.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: fb5af65f4d1bdb6925e95bca0f1ddb02f01355a7
https://github.com/Dolibarr/dolibarr/commit/fb5af65f4d1bdb6925e95bca0f1ddb02f01355a7
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-15 (Mon, 15 Jul 2019)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
FIX #11466
Commit: f826e9631cafe5e54cc6918714b81445713d4ea0
https://github.com/Dolibarr/dolibarr/commit/f826e9631cafe5e54cc6918714b81445713d4ea0
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/societe/agenda.php
Log Message:
-----------
FIX #11463
Commit: f44182c89f2620c210db8877f4283dc885dde526
https://github.com/Dolibarr/dolibarr/commit/f44182c89f2620c210db8877f4283dc885dde526
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/commande/card.php
M htdocs/core/tpl/object_discounts.tpl.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 70ff806fdffdd50435afb1e043ea59f5011bbe90
https://github.com/Dolibarr/dolibarr/commit/70ff806fdffdd50435afb1e043ea59f5011bbe90
Author: John Botella <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
fix fourn code preload
Commit: de2c18913885e73d15b4f056dba96e1e53410fb5
https://github.com/Dolibarr/dolibarr/commit/de2c18913885e73d15b4f056dba96e1e53410fb5
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
Merge pull request #11516 from atm-john/9.0_fix_fourn_code_preload
FIX The proposed new supplier code does not work
Commit: 617d10bf2a288042e2565aaabb2e669debe7d342
https://github.com/Dolibarr/dolibarr/commit/617d10bf2a288042e2565aaabb2e669debe7d342
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/product/list.php
Log Message:
-----------
Merge pull request #11512 from
atm-florianm/9.0_FIX_missing-hooks-in-supplier-product-list-and-supplier-product-dispatch
9.0 fix missing hooks in supplier product list and supplier product dispatch
Commit: c9fe91138d42963e6343923b0b812bfcb893051b
https://github.com/Dolibarr/dolibarr/commit/c9fe91138d42963e6343923b0b812bfcb893051b
Author: Regis Houssin <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/opensurvey/index.php
M htdocs/ticket/index.php
M htdocs/ticket/list.php
Log Message:
-----------
FIX better compatibility with Multicompany
Commit: 917799914e6f04316a57dbe8d0bae7e7e0f6fbcb
https://github.com/Dolibarr/dolibarr/commit/917799914e6f04316a57dbe8d0bae7e7e0f6fbcb
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/langs/fr_FR/sendings.lang
Log Message:
-----------
Merge pull request #11433 from
atm-florianm/FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set
FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_CLOSE
is set
Commit: 464bda996c5a846e3fea7d0df8d729285c6e2630
https://github.com/Dolibarr/dolibarr/commit/464bda996c5a846e3fea7d0df8d729285c6e2630
Author: Marc de Lima Lucio <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
FIX: propal createFrom hook: undefined parameter attached
Commit: c72a59ad36641ab13dbe382c8d52fb36d68b0461
https://github.com/Dolibarr/dolibarr/commit/c72a59ad36641ab13dbe382c8d52fb36d68b0461
Author: gauthier <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
FIX : we need to be able to add freeline with qty between 0 & 1 in
supplierorder line
Commit: a03a8da2fd3a250c265a5e3003f631fed470aa73
https://github.com/Dolibarr/dolibarr/commit/a03a8da2fd3a250c265a5e3003f631fed470aa73
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #11519 from atm-gauthier/8.0_fix_addline_cmdfourn_qty_inf_0
FIX : we need to be able to add freeline with qty between 0 & 1 in su…
Commit: 77300e12108749c56d3ba82e4e1e010e544f78c6
https://github.com/Dolibarr/dolibarr/commit/77300e12108749c56d3ba82e4e1e010e544f78c6
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Merge pull request #11518 from ATM-Marc/FIX_9.0_propal_clone_hook
FIX: propal createFrom hook: undefined parameter attached
Commit: a3b746bcb956251bde364fa3ee16bc334c82081b
https://github.com/Dolibarr/dolibarr/commit/a3b746bcb956251bde364fa3ee16bc334c82081b
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/opensurvey/index.php
M htdocs/ticket/index.php
M htdocs/ticket/list.php
Log Message:
-----------
Merge pull request #11517 from hregis/9.0_bug2
FIX better compatibility with Multicompany
Commit: aab23a15317a62e44f551eb71d43058e8f96b24e
https://github.com/Dolibarr/dolibarr/commit/aab23a15317a62e44f551eb71d43058e8f96b24e
Author: Christophe Battarel <address@hidden>
Date: 2019-07-16 (Tue, 16 Jul 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX : do not return formatted prices in json string
Commit: b5d348356dbc590b50ec97b25fceae111e7ac91a
https://github.com/Dolibarr/dolibarr/commit/b5d348356dbc590b50ec97b25fceae111e7ac91a
Author: John Botella <address@hidden>
Date: 2019-07-17 (Wed, 17 Jul 2019)
Changed paths:
M htdocs/comm/action/list.php
Log Message:
-----------
Fix socpeople assigned list in action com list
Commit: 32bc8a5fafb51d4070014f29f84456b4690b1762
https://github.com/Dolibarr/dolibarr/commit/32bc8a5fafb51d4070014f29f84456b4690b1762
Author: Christophe Battarel <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
FIX fournrprice log for insert
Commit: 5daf0316f95b351fadfb4fee11ae42f5d0387908
https://github.com/Dolibarr/dolibarr/commit/5daf0316f95b351fadfb4fee11ae42f5d0387908
Author: Christophe Battarel <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
also fix bad insert sql command
Commit: 29974a5fbff5bb6347b2d112cff8446fa6992cdb
https://github.com/Dolibarr/dolibarr/commit/29974a5fbff5bb6347b2d112cff8446fa6992cdb
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/blockedlog/admin/blockedlog_list.php
Log Message:
-----------
Fix css
Commit: 5f917c6f7eb161f1be417300bbe45ad27cd350ee
https://github.com/Dolibarr/dolibarr/commit/5f917c6f7eb161f1be417300bbe45ad27cd350ee
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M dev/dolibarr_changes.txt
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/subscription/list.php
M htdocs/bom/class/bom.class.php
M htdocs/commande/card.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/stats/byratecountry.php
M htdocs/contact/class/contact.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modBanque.class.php
M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
M htdocs/core/tpl/object_discounts.tpl.php
M htdocs/debugbar/class/DataCollector/DolLogsCollector.php
M htdocs/includes/mike42/escpos-php/Escpos.php
M htdocs/install/mysql/data/llx_c_email_templates.sql
M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
M htdocs/install/mysql/tables/llx_bom_bomline.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/public/stripe/confirm_payment.php
M htdocs/societe/agenda.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/paymentmodes.php
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: e976195777077a9acbf9ce058ac18ed47876529f
https://github.com/Dolibarr/dolibarr/commit/e976195777077a9acbf9ce058ac18ed47876529f
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/user/list.php
Log Message:
-----------
Fix missing key for api
Commit: 3b393e818a786b92b6a67de96cd909ca1662fe8f
https://github.com/Dolibarr/dolibarr/commit/3b393e818a786b92b6a67de96cd909ca1662fe8f
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Fix missing entity property into fetch
Commit: c961a397c480438be5c1ca78ec9bc4753b49f37b
https://github.com/Dolibarr/dolibarr/commit/c961a397c480438be5c1ca78ec9bc4753b49f37b
Author: atm-ph <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/compta/facture/prelevement.php
Log Message:
-----------
Fix missing hook then can't interact with actions
Commit: 984fe9834256fa3169f753589b414dab9fea82d2
https://github.com/Dolibarr/dolibarr/commit/984fe9834256fa3169f753589b414dab9fea82d2
Author: atm-ph <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/compta/prelevement/create.php
Log Message:
-----------
Fix missing hook
Commit: f53f314211a29624cd3f61b8d3d2994ce9b69dc4
https://github.com/Dolibarr/dolibarr/commit/f53f314211a29624cd3f61b8d3d2994ce9b69dc4
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
Update fournisseur.product.class.php
Commit: d04a092756b3f92a4f38c9daf68df8fbc7bb52a3
https://github.com/Dolibarr/dolibarr/commit/d04a092756b3f92a4f38c9daf68df8fbc7bb52a3
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
Merge pull request #11525 from altatof/fournpricelog
FIX fournrprice log for insert
Commit: 747305fcc63846776d9b6a612becd43cd7f4d10f
https://github.com/Dolibarr/dolibarr/commit/747305fcc63846776d9b6a612becd43cd7f4d10f
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #11521 from altatof/jsonprices10
FIX : do not return formatted prices in json string
Commit: a20a121558bd03a6d6db2f76796ba2456bb70011
https://github.com/Dolibarr/dolibarr/commit/a20a121558bd03a6d6db2f76796ba2456bb70011
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/comm/action/list.php
Log Message:
-----------
Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned
FIX: socpeople assigned list in action com list
Commit: e54887213357668d4173824d0bcc0977a1659549
https://github.com/Dolibarr/dolibarr/commit/e54887213357668d4173824d0bcc0977a1659549
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/compta/facture/prelevement.php
Log Message:
-----------
Update prelevement.php
Commit: b3182f65bc98db714a157c535db031845c5a007c
https://github.com/Dolibarr/dolibarr/commit/b3182f65bc98db714a157c535db031845c5a007c
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/compta/prelevement/create.php
Log Message:
-----------
Update create.php
Commit: b0baba329301d571d3271258c43c30bd69feb979
https://github.com/Dolibarr/dolibarr/commit/b0baba329301d571d3271258c43c30bd69feb979
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/compta/facture/prelevement.php
M htdocs/compta/prelevement/create.php
Log Message:
-----------
Merge pull request #11526 from atm-ph/fix_9.0_missing_hook
Fix missing hook then can't interact with actions
Commit: a09d33b4277e41e7ae94f29223984b116cbfe4be
https://github.com/Dolibarr/dolibarr/commit/a09d33b4277e41e7ae94f29223984b116cbfe4be
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/admin/holiday.php
Log Message:
-----------
Fix responsive
Commit: ad4267abfbd5273a21a38682f0843ed4145ba0e6
https://github.com/Dolibarr/dolibarr/commit/ad4267abfbd5273a21a38682f0843ed4145ba0e6
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: b044d95acfd41b87e5c742063297a9da94e5e480
https://github.com/Dolibarr/dolibarr/commit/b044d95acfd41b87e5c742063297a9da94e5e480
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/compta/stats/byratecountry.php
M htdocs/core/class/commonobject.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/langs/fr_FR/sendings.lang
Log Message:
-----------
Merge
Commit: 5e204f0f677c54543dd7837cadf152a6069b5512
https://github.com/Dolibarr/dolibarr/commit/5e204f0f677c54543dd7837cadf152a6069b5512
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/adherents/card.php
M htdocs/comm/action/list.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/create.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/tpl/commonfields_edit.tpl.php
M htdocs/core/tpl/commonfields_view.tpl.php
M htdocs/core/tpl/object_discounts.tpl.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/product/list.php
M htdocs/install/mysql/data/llx_c_email_templates.sql
M htdocs/opensurvey/index.php
M htdocs/societe/card.php
M htdocs/ticket/index.php
M htdocs/ticket/list.php
Log Message:
-----------
Merge
Commit: 3cffd70ed304a5c684cc32108a6d24f2a45dfe1b
https://github.com/Dolibarr/dolibarr/commit/3cffd70ed304a5c684cc32108a6d24f2a45dfe1b
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M htdocs/comm/action/list.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/prelevement/create.php
M htdocs/core/class/commonobject.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/product/list.php
M htdocs/langs/fr_FR/sendings.lang
M htdocs/opensurvey/index.php
M htdocs/societe/card.php
M htdocs/ticket/index.php
M htdocs/ticket/list.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
Commit: 50480bf51716956be5fdea9612602f248aa3d400
https://github.com/Dolibarr/dolibarr/commit/50480bf51716956be5fdea9612602f248aa3d400
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M dev/dolibarr_changes.txt
M htdocs/accountancy/admin/journals_list.php
M htdocs/admin/holiday.php
M htdocs/blockedlog/admin/blockedlog_list.php
M htdocs/comm/action/list.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/prelevement/create.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/tpl/object_discounts.tpl.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/product/list.php
M htdocs/includes/mike42/escpos-php/Escpos.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/fr_FR/sendings.lang
M htdocs/opensurvey/index.php
M htdocs/product/price.php
M htdocs/projet/class/project.class.php
M htdocs/societe/agenda.php
M htdocs/societe/card.php
M htdocs/ticket/index.php
M htdocs/ticket/list.php
M htdocs/user/list.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/b9fe874b5f69...50480bf51716