Commit Graph

78363 Commits

Author SHA1 Message Date
Laurent Destailleur
b1495e12ce FIX A variable was erased by a temporary variable 2020-04-30 18:45:00 +02:00
Laurent Destailleur
84bca036c9 FIX Link missing into email of some notification 2020-04-29 18:03:28 +02:00
Laurent Destailleur
a0c013d87b Fix missing link
Conflicts:
	htdocs/core/class/notify.class.php
2020-04-28 19:18:31 +02:00
Laurent Destailleur
10ab97944a
Merge pull request #13752 from fmarcet/10.0
FIX: Wrong Sql on getListOfTowns api method
2020-04-27 11:42:19 +02:00
Ferran Marcet
b90a6024f5 FIX: Wrong Sql on getListOfTowns api method 2020-04-27 10:15:47 +02:00
Laurent Destailleur
6798e9e6f5 Fix remove warning missing the seller in update_price 2020-04-24 19:52:54 +02:00
Laurent Destailleur
df10b86d1f FIX consistency of price w/wo vat wrong when price entered with tax 2020-04-24 19:52:34 +02:00
Laurent Destailleur
df91780552 FIX Situation invoice take into account the credit notes. 2020-04-24 15:57:08 +02:00
Laurent Destailleur
42ee9845ad Report error 2020-04-24 15:21:02 +02:00
Laurent Destailleur
1101c4e587 Fix trans 2020-04-23 18:01:04 +02:00
Laurent Destailleur
f7d4d78008 Fix error 500 2020-04-23 17:55:55 +02:00
Laurent Destailleur
cd1368cb71 Fix dispatch in ledger for various payment done in same account when
there is 2 different transaction in 2 different account (backport v12)
2020-04-23 17:10:40 +02:00
Laurent Destailleur
ab586b8f42
Merge pull request #13696 from atm-gauthier/10.0_fix_export_model_list_display_order
FIX : model export list must be sorted by label
2020-04-22 18:08:58 +02:00
gauthier
43f4c5ac96 FIX : model export list must be sorted by label 2020-04-22 15:29:54 +02:00
Laurent Destailleur
f6735ce8f2 Update repair.sql script 2020-04-21 14:28:52 +02:00
Laurent Destailleur
536ab95207 FIX: The "test smtp connectivity" failed on page to setup mass emailing
Conflicts:
	htdocs/admin/mails.php
2020-04-21 12:50:20 +02:00
Laurent Destailleur
fb24fbba05
Merge pull request #13662 from atm-gauthier/10.0_fix_vcard
FIX : we must export company mail address on contact vcard only if co…
2020-04-20 16:04:17 +02:00
gauthier
b72651fdfd FIX : we must export company mail address on contact vcard only if contact email address is empty 2020-04-20 15:59:44 +02:00
Laurent Destailleur
85bea5a7c4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-14 21:54:27 +02:00
Laurent Destailleur
110787d66a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-14 21:54:16 +02:00
Laurent Destailleur
afbfd66ee9
Merge pull request #13581 from atm-maxime/fix_expedition_warning_count
Fix warning on shipment because of count func
2020-04-12 17:21:28 +02:00
Laurent Destailleur
8e6de35d7b
Merge pull request #13568 from atm-maxime/10.0
FIX #13535 : state in italian address
2020-04-12 17:03:24 +02:00
Laurent Destailleur
94ae75c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-12 16:53:07 +02:00
Laurent Destailleur
eebf48b27c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:52:58 +02:00
Laurent Destailleur
e9ee7a23e6
Merge pull request #13573 from frederic34/patch-11
Update actioncomm.class.php
2020-04-12 16:42:07 +02:00
Maxime Kohlhaas
3ca0d48b37 Fix warning on shipment because of count func 2020-04-12 10:45:30 +02:00
Frédéric FRANCE
e2660fd31c
Update actioncomm.class.php 2020-04-11 22:38:28 +02:00
Maxime Kohlhaas
f5ab957faf FIX #13535 : state in italian address 2020-04-11 17:56:23 +02:00
Laurent Destailleur
70e71d32c7
Merge pull request #13555 from atm-gauthier/fix_cabyprodserv
FIX : some others modules (like subtotal) use other product_type than…
2020-04-10 20:03:56 +02:00
gauthier
1f471d46eb FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report 2020-04-10 15:51:51 +02:00
Laurent Destailleur
a1e714f123 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-04-10 02:03:12 +02:00
Laurent Destailleur
c4d898e155 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-04-10 02:01:31 +02:00
Laurent Destailleur
f52f59e80a
Merge pull request #13540 from atm-gauthier/10.0_quote
FIX : IHM, unexpected quote
2020-04-09 19:43:39 +02:00
gauthier
3327f1c074 FIX : IHM, unexpected quote 2020-04-09 11:53:03 +02:00
Laurent Destailleur
49c38042a9
Merge pull request #13504 from atm-quentin/10.0_fix_author_supplier_proposal
FIX author search supplier proposal list
2020-04-08 14:47:17 +02:00
Laurent Destailleur
2ec60c9d55
Merge pull request #13508 from hregis/8.0_mc3
FIX missing member entity
2020-04-07 21:14:06 +02:00
Regis Houssin
34e434a17e FIX missing member entity 2020-04-06 16:36:11 +02:00
atm-quentin
9950295e41 FIX author search supplier proposal list 2020-04-06 10:29:04 +02:00
Laurent Destailleur
e32ac7644d FIX Send email from bulk action of list of thirdparties 2020-04-05 15:31:18 +02:00
Laurent Destailleur
eac75497c0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-05 03:42:12 +02:00
Laurent Destailleur
d0c4af5855 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-05 03:42:05 +02:00
Laurent Destailleur
8a14652eae
Merge pull request #13449 from atm-quentin/FIX_missing_default_accountancy_product_buy_code
FIX missing default accountancy product buy code
2020-04-05 03:41:46 +02:00
Laurent Destailleur
683ddac0d4
Merge pull request #13493 from ptibogxiv/patch-320
FIX child categories only with good entity rights
2020-04-05 02:40:43 +02:00
ptibogxiv
c7cdb64087
FIX child categories only with good entity rights
fix v9 to develop
display only categories with good entity rights ( intradolibarr or via REST API)
2020-04-04 11:07:48 +02:00
Laurent Destailleur
733814a8a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-02 18:51:36 +02:00
Laurent Destailleur
7cee643c05 Prepare 10.0.8 2020-04-02 18:51:25 +02:00
Laurent Destailleur
3c75c29e6b
Merge pull request #13463 from atm-quentin/FIX_buyprice_filter_was_only_qty
FIX : Buyprice was updated only if min price for this qty had same qty
2020-04-02 13:08:40 +02:00
Laurent Destailleur
3b6db77cb3
Merge pull request #13460 from atm-quentin/FIX_multicurrency_SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL
FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRIC…
2020-04-02 13:04:00 +02:00
Laurent Destailleur
c6f57c46a8
Update supplier_proposal.class.php 2020-04-02 13:01:49 +02:00
Laurent Destailleur
a923ef5a6d
Merge pull request #13456 from atm-gauthier/9.0_fix_migrate_picture_path_script
FIX : picture migration script from doli 9.0
2020-04-02 12:50:23 +02:00