[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 95417d: allow standalone credit note
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 95417d: allow standalone credit note even if no invoice |
Date: |
Sat, 05 Oct 2019 10:36:00 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 95417d4c86129b1a55283d097ebece7857b87265
https://github.com/Dolibarr/dolibarr/commit/95417d4c86129b1a55283d097ebece7857b87265
Author: Christophe Battarel <address@hidden>
Date: 2019-09-10 (Tue, 10 Sep 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
allow standalone credit note even if no invoice
Commit: c8cb5886f4c17ab01a1672557fa232bb3a64b1a2
https://github.com/Dolibarr/dolibarr/commit/c8cb5886f4c17ab01a1672557fa232bb3a64b1a2
Author: Christophe Battarel <address@hidden>
Date: 2019-09-10 (Tue, 10 Sep 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
correction
Commit: ea1baefe9a5edab606f20588169943860c954e95
https://github.com/Dolibarr/dolibarr/commit/ea1baefe9a5edab606f20588169943860c954e95
Author: ptibogxiv <address@hidden>
Date: 2019-09-15 (Sun, 15 Sep 2019)
Changed paths:
M htdocs/product/class/api_products.class.php
Log Message:
-----------
NEW: delete purchase price API
Commit: 2ac8bd4e1629f27e5f5c745ade6db6f0b3933fd3
https://github.com/Dolibarr/dolibarr/commit/2ac8bd4e1629f27e5f5c745ade6db6f0b3933fd3
Author: gauthier <address@hidden>
Date: 2019-09-17 (Tue, 17 Sep 2019)
Changed paths:
M htdocs/core/class/discount.class.php
Log Message:
-----------
FIX : If we share invoice, we need to see discount created from a deposit on
each entity
Commit: d40534e8fadf0a11034010bb27b53b8b70290294
https://github.com/Dolibarr/dolibarr/commit/d40534e8fadf0a11034010bb27b53b8b70290294
Author: gauthier <address@hidden>
Date: 2019-09-19 (Thu, 19 Sep 2019)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
FIX : change product type must be allowed if we activate hidden conf
Commit: 4b3430a1dc5109ed0dd8c422d9721e2c0847ef5a
https://github.com/Dolibarr/dolibarr/commit/4b3430a1dc5109ed0dd8c422d9721e2c0847ef5a
Author: madx666 <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix return to list on page 1
When are on page 1 on any list and we go on an object, when return to the list,
we are back on page 0
Commit: e3edb376209af4646fde5d05b654254936b831e9
https://github.com/Dolibarr/dolibarr/commit/e3edb376209af4646fde5d05b654254936b831e9
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/resource/class/dolresource.class.php
Log Message:
-----------
Fix escape db
Commit: 5f08a649ebdaae8c3ff5f09f4acab81e0a49a6e6
https://github.com/Dolibarr/dolibarr/commit/5f08a649ebdaae8c3ff5f09f4acab81e0a49a6e6
Author: VESSILLER <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/product/class/html.formproduct.class.php
Log Message:
-----------
FIX empty cache when we want to load specific warehouses in select
Conflicts:
htdocs/product/class/html.formproduct.class.php
Commit: ea62ea8c701d4bf3c1157b3f0eb14210f81324af
https://github.com/Dolibarr/dolibarr/commit/ea62ea8c701d4bf3c1157b3f0eb14210f81324af
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/product/class/api_products.class.php
Log Message:
-----------
Merge pull request #11901 from ptibogxiv/patch-263
NEW: delete purchase price API
Commit: 46e019642f019e1cee2cfb64fddf8fae076c11ea
https://github.com/Dolibarr/dolibarr/commit/46e019642f019e1cee2cfb64fddf8fae076c11ea
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Code comment
Commit: 18055bc4256a8bc4c19e25a05f6f233fb32b704c
https://github.com/Dolibarr/dolibarr/commit/18055bc4256a8bc4c19e25a05f6f233fb32b704c
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/product/class/api_products.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: d0d884742f64dab255008ea811a32d5e6802c25e
https://github.com/Dolibarr/dolibarr/commit/d0d884742f64dab255008ea811a32d5e6802c25e
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-27 (Fri, 27 Sep 2019)
Changed paths:
M htdocs/core/class/cunits.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/modules/modProduct.class.php
M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
M htdocs/product/card.php
M htdocs/product/class/html.formproduct.class.php
Log Message:
-----------
FIX #11861 Not consistent code to manage measuring units
Commit: d2881eb85b75310a126efe38b3f3de88c4c6d3f8
https://github.com/Dolibarr/dolibarr/commit/d2881eb85b75310a126efe38b3f3de88c4c6d3f8
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-29 (Sun, 29 Sep 2019)
Changed paths:
M htdocs/core/class/extrafields.class.php
M htdocs/core/tpl/extrafields_list_search_input.tpl.php
Log Message:
-----------
FIX CSS
Conflicts:
htdocs/core/tpl/extrafields_list_search_input.tpl.php
Commit: 29d941cb6ef8a4fae5c695fa37ce62f5d01fba81
https://github.com/Dolibarr/dolibarr/commit/29d941cb6ef8a4fae5c695fa37ce62f5d01fba81
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-30 (Mon, 30 Sep 2019)
Changed paths:
M htdocs/core/class/discount.class.php
Log Message:
-----------
Merge pull request #11918 from
atm-gauthier/8.0_fix_discount_visibility_follows_invoice_sharing
FIX : If we share invoice, we need to see discount created from a deposit on
each entity
Commit: 945dd0ae897c2510a7fbdc3d30347d97f4003f78
https://github.com/Dolibarr/dolibarr/commit/945dd0ae897c2510a7fbdc3d30347d97f4003f78
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-30 (Mon, 30 Sep 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Update card.php
Commit: 4f356fa4127519065f432d4581f3204cfd5e96f7
https://github.com/Dolibarr/dolibarr/commit/4f356fa4127519065f432d4581f3204cfd5e96f7
Author: Laurent Destailleur <address@hidden>
Date: 2019-09-30 (Mon, 30 Sep 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge pull request #11859 from altatof/avoir
FIX : allow standalone credit note even if no invoice
Commit: 2167e7ed98b2b5085e1cb7d9ef6fc677ba3dbde6
https://github.com/Dolibarr/dolibarr/commit/2167e7ed98b2b5085e1cb7d9ef6fc677ba3dbde6
Author: gauthier <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
FIX : hidden conf to prevent from changing product_type
Commit: 6ee17022c06ba3a0ac98a0d01e87902037115566
https://github.com/Dolibarr/dolibarr/commit/6ee17022c06ba3a0ac98a0d01e87902037115566
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Fix bad key for type of contact of resources
Commit: 15e646cc6235c38b05c4355f09d2032b6b6b77a7
https://github.com/Dolibarr/dolibarr/commit/15e646cc6235c38b05c4355f09d2032b6b6b77a7
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/core/class/html.formticket.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/ticket/card.php
M htdocs/ticket/class/ticket.class.php
Log Message:
-----------
Fix bad name of trigger
Commit: 322786cabeaf00d9ee68535014a11608f732bd54
https://github.com/Dolibarr/dolibarr/commit/322786cabeaf00d9ee68535014a11608f732bd54
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/admin/facture.php
Log Message:
-----------
Look and feel v10
Commit: d2015155140ca619c3b73ce5c94765bd11903790
https://github.com/Dolibarr/dolibarr/commit/d2015155140ca619c3b73ce5c94765bd11903790
Author: Frédéric FRANCE <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/core/boxes/box_prospect.php
Log Message:
-----------
Update box_prospect.php
Commit: 4ff65ce5862067bd606ae49bd75474711908d20b
https://github.com/Dolibarr/dolibarr/commit/4ff65ce5862067bd606ae49bd75474711908d20b
Author: Frédéric FRANCE <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/core/boxes/box_supplier_orders.php
Log Message:
-----------
Update box_supplier_orders.php
Commit: 7872a93605a1de7559b4f736bcde3d00a9b3cc5d
https://github.com/Dolibarr/dolibarr/commit/7872a93605a1de7559b4f736bcde3d00a9b3cc5d
Author: Frédéric FRANCE <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/core/boxes/box_commandes.php
Log Message:
-----------
Update box_commandes.php
Commit: 956b46d92016d828142c44e8c7c38d8233c9bc20
https://github.com/Dolibarr/dolibarr/commit/956b46d92016d828142c44e8c7c38d8233c9bc20
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/install/inc.php
Log Message:
-----------
Fix warnings
Commit: 64381ac4d6f2be041a1f510abdc7c74c863732a5
https://github.com/Dolibarr/dolibarr/commit/64381ac4d6f2be041a1f510abdc7c74c863732a5
Author: Frédéric FRANCE <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/bom/class/api_boms.class.php
Log Message:
-----------
Update api_boms.class.php
Commit: 9b607a3105057be082f8cc70dafdd1df518a77a2
https://github.com/Dolibarr/dolibarr/commit/9b607a3105057be082f8cc70dafdd1df518a77a2
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/ticket/list.php
Log Message:
-----------
FIX navigation on ticket tab of projects
Commit: 2d42afc686705008269a20e55c35a9d5bdde1e61
https://github.com/Dolibarr/dolibarr/commit/2d42afc686705008269a20e55c35a9d5bdde1e61
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/ticket/list.php
Log Message:
-----------
FIX Filter on project on ticket list
Commit: d6198a1e331fb774168f782e96bf0310966f067b
https://github.com/Dolibarr/dolibarr/commit/d6198a1e331fb774168f782e96bf0310966f067b
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks.php
Log Message:
-----------
Fix billed time is empty
Commit: d448998762dce672c082d95286095b440e34bd11
https://github.com/Dolibarr/dolibarr/commit/d448998762dce672c082d95286095b440e34bd11
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Update card.php
Commit: 4928a999a06113be853b2c3be38de451b281ca80
https://github.com/Dolibarr/dolibarr/commit/4928a999a06113be853b2c3be38de451b281ca80
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-01 (Tue, 01 Oct 2019)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Merge pull request #11933 from
atm-gauthier/fix_conf_to_allow_changeproducttype
FIX : change product type must be allowed if we activate hidden conf
Commit: ad3cbd17c2a2918cb1bb6c6fc10011258151e2f6
https://github.com/Dolibarr/dolibarr/commit/ad3cbd17c2a2918cb1bb6c6fc10011258151e2f6
Author: Frédéric FRANCE <address@hidden>
Date: 2019-10-02 (Wed, 02 Oct 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
backport commit for setmulticurrency
https://github.com/Dolibarr/dolibarr/commit/a4892071227156be6a0c8729c91b46eb6474aca2#diff-48f18024fb928ce21b76ef02fc967c67
Commit: 0d41216624ba6c5b4f464b8dba7d48e48a84d763
https://github.com/Dolibarr/dolibarr/commit/0d41216624ba6c5b4f464b8dba7d48e48a84d763
Author: Frédéric FRANCE <address@hidden>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M htdocs/core/class/dolgraph.class.php
Log Message:
-----------
Update dolgraph.class.php
Commit: 03614536f95c392efdcfd292294f763bc6470cb1
https://github.com/Dolibarr/dolibarr/commit/03614536f95c392efdcfd292294f763bc6470cb1
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #12018 from frederic34/patch-12
backport commit for setmulticurrency
Commit: 9762d77958d64a015e6d57c75dd6f1d70a13a0fb
https://github.com/Dolibarr/dolibarr/commit/9762d77958d64a015e6d57c75dd6f1d70a13a0fb
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M htdocs/core/class/dolgraph.class.php
Log Message:
-----------
Merge pull request #12024 from frederic34/patch-17
Update dolgraph.class.php
Commit: ae01bd8f07e43dbcbb8fc5278a0d682e0ef5177e
https://github.com/Dolibarr/dolibarr/commit/ae01bd8f07e43dbcbb8fc5278a0d682e0ef5177e
Author: atm-lena <address@hidden>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
FIX missing begin()
Commit: 7412335217b88fcd4530e77d3899d56d47299cb9
https://github.com/Dolibarr/dolibarr/commit/7412335217b88fcd4530e77d3899d56d47299cb9
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #12031 from atm-lena/8.0_fix_missingbegin
FIX missing begin()
Commit: 75be637b0b68ec59f23906865e9e5211b14264c9
https://github.com/Dolibarr/dolibarr/commit/75be637b0b68ec59f23906865e9e5211b14264c9
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M htdocs/core/class/discount.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/product/card.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: d9aa81619790a44a1ea1c9ed1da815cd9366f414
https://github.com/Dolibarr/dolibarr/commit/d9aa81619790a44a1ea1c9ed1da815cd9366f414
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 1a66e0b05e43de730e5d81f87ba66d995277d863
https://github.com/Dolibarr/dolibarr/commit/1a66e0b05e43de730e5d81f87ba66d995277d863
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/discount.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/product/card.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/product/card.php
Commit: b787e53020c09d848e32885e654ef10b4aa251e0
https://github.com/Dolibarr/dolibarr/commit/b787e53020c09d848e32885e654ef10b4aa251e0
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M htdocs/core/class/dolgraph.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 6cd3d278852b3b441779e9656b93a070eba090e1
https://github.com/Dolibarr/dolibarr/commit/6cd3d278852b3b441779e9656b93a070eba090e1
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-04 (Fri, 04 Oct 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Fix comparison
Commit: 0b9d27423d073ee61608e31220682cc8f0e2fd92
https://github.com/Dolibarr/dolibarr/commit/0b9d27423d073ee61608e31220682cc8f0e2fd92
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-04 (Fri, 04 Oct 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/paiement.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX Can't modify vendor invoice if transfered into accountancy
Commit: 68c28ab3c713103713ed78870c15d17305e5cf3d
https://github.com/Dolibarr/dolibarr/commit/68c28ab3c713103713ed78870c15d17305e5cf3d
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-04 (Fri, 04 Oct 2019)
Changed paths:
M htdocs/societe/project.php
Log Message:
-----------
FIX Look and feel v10
Commit: c3fa770871ac5d1c5efafe749bb89385051421c8
https://github.com/Dolibarr/dolibarr/commit/c3fa770871ac5d1c5efafe749bb89385051421c8
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-04 (Fri, 04 Oct 2019)
Changed paths:
M htdocs/ticket/list.php
Log Message:
-----------
FIX Filter "Open all" of ticket was ko.
Commit: 503973cec97c608de0b039008c26409f56d0ff11
https://github.com/Dolibarr/dolibarr/commit/503973cec97c608de0b039008c26409f56d0ff11
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-04 (Fri, 04 Oct 2019)
Changed paths:
M htdocs/admin/ticket.php
M htdocs/admin/ticket_public.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX Edit of ticket module parameters erased others
Commit: 8bf9afb7ca2542f448ed7c23226fe8db00e3a65b
https://github.com/Dolibarr/dolibarr/commit/8bf9afb7ca2542f448ed7c23226fe8db00e3a65b
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-04 (Fri, 04 Oct 2019)
Changed paths:
M htdocs/core/class/html.formmail.class.php
M htdocs/ticket/card.php
M htdocs/ticket/class/ticket.class.php
Log Message:
-----------
FIX Attachement of linked files on ticket when sending a message
Commit: a06b1b9f3ff6e426018010a981aa4581a877cc88
https://github.com/Dolibarr/dolibarr/commit/a06b1b9f3ff6e426018010a981aa4581a877cc88
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-05 (Sat, 05 Oct 2019)
Changed paths:
M htdocs/ticket/card.php
Log Message:
-----------
Fix escaping chars
Commit: 083db124907d17dec1c81bcb30f8665083437924
https://github.com/Dolibarr/dolibarr/commit/083db124907d17dec1c81bcb30f8665083437924
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-05 (Sat, 05 Oct 2019)
Changed paths:
M htdocs/public/ticket/view.php
Log Message:
-----------
FIX access to public interface when origin email has an alias.
Commit: e90234c2bc2e91d396d5bd160b337f8ecb71fc8c
https://github.com/Dolibarr/dolibarr/commit/e90234c2bc2e91d396d5bd160b337f8ecb71fc8c
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-05 (Sat, 05 Oct 2019)
Changed paths:
M htdocs/core/class/html.formticket.class.php
Log Message:
-----------
FIX escape email alias
Commit: 3e5cd877b8e3a1c29d0023006c191852d194b590
https://github.com/Dolibarr/dolibarr/commit/3e5cd877b8e3a1c29d0023006c191852d194b590
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-05 (Sat, 05 Oct 2019)
Changed paths:
M htdocs/public/ticket/list.php
Log Message:
-----------
FIX Bad list of ticket on public interface for ticket emailcollector
Commit: 7f5ccf4b8e5e1a6e13f656a0644ca535f70ce022
https://github.com/Dolibarr/dolibarr/commit/7f5ccf4b8e5e1a6e13f656a0644ca535f70ce022
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-05 (Sat, 05 Oct 2019)
Changed paths:
M htdocs/admin/system/about.php
M htdocs/core/lib/payments.lib.php
Log Message:
-----------
Remove google+
Commit: ac8837d01fb1f728f768045667ac47c4ed36d042
https://github.com/Dolibarr/dolibarr/commit/ac8837d01fb1f728f768045667ac47c4ed36d042
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-05 (Sat, 05 Oct 2019)
Changed paths:
M htdocs/core/lib/payments.lib.php
Log Message:
-----------
Fix url
Commit: b883a8092a286a2f89cfa821a724160983596984
https://github.com/Dolibarr/dolibarr/commit/b883a8092a286a2f89cfa821a724160983596984
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-05 (Sat, 05 Oct 2019)
Changed paths:
M htdocs/admin/system/about.php
M htdocs/admin/ticket.php
M htdocs/admin/ticket_public.php
M htdocs/compta/facture/card.php
M htdocs/compta/paiement.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/modules/modProduct.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/facture/card.php
M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
M htdocs/product/card.php
M htdocs/product/class/api_products.class.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/societe/project.php
M htdocs/ticket/card.php
M htdocs/ticket/class/ticket.class.php
M htdocs/ticket/list.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/7c685bc76fb2...b883a8092a28