Commit Graph

68597 Commits

Author SHA1 Message Date
Laurent Destailleur
c9ef298839 Fix setup template emails 2018-10-31 11:38:04 +01:00
Laurent Destailleur
ea5b0f53d0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 22:32:54 +01:00
Laurent Destailleur
866729cd21 FIX bad link in notification 2018-10-30 22:32:42 +01:00
Laurent Destailleur
a183c7d131
Merge pull request #9926 from frederic34/patch-9
fix display holiday month report if none
2018-10-30 21:21:28 +01:00
Frédéric FRANCE
46fd3bcaf8
fix display holiday month report if none 2018-10-30 21:15:52 +01:00
Laurent Destailleur
b9078c6d58 Fix phpcs 2018-10-30 15:30:04 +01:00
Laurent Destailleur
ecdecfcbce Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 15:28:23 +01:00
Laurent Destailleur
2b526f7469 Fix phpcs 2018-10-30 15:28:11 +01:00
Laurent Destailleur
4dca94480e
Merge pull request #9892 from atm-maxime/fix_supp_inv_clone
Fix invoice supplier clone was not getting all lines parameters #9800
2018-10-30 14:59:48 +01:00
Laurent Destailleur
cb2a5baa45
Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice
Fix clone fourn order and invoice lines special code
2018-10-30 14:55:50 +01:00
Laurent Destailleur
2c8b7a4a3d
Merge pull request #9905 from atm-maxime/fix_currency_change
Fix changing currency in a doc was recalculating amounts in company currency #9801
2018-10-30 14:48:46 +01:00
Laurent Destailleur
afe61579e8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-30 14:28:25 +01:00
Laurent Destailleur
a231932972
Merge pull request #9904 from atm-maxime/fix_replenish_qtymin
FIX replenish wasn't caring about supplier price min quantity #9561
2018-10-30 14:25:55 +01:00
Laurent Destailleur
38396e490a
Merge pull request #9891 from frederic34/patch-17
Update brouillon when validate order
2018-10-30 14:17:29 +01:00
Laurent Destailleur
8ce035fc36
Merge pull request #9894 from librethic-code/patch-1
FIX: keep external module element when adding resource
2018-10-30 14:06:38 +01:00
Laurent Destailleur
0127682996
Merge pull request #9881 from grandoc/8.0
merging and typo
2018-10-30 12:41:56 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email
FIX the member e-mail on resign and validation.
2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php 2018-10-30 12:41:06 +01:00
Laurent Destailleur
06bffeeca5
Merge pull request #9910 from atm-ph/fix_8.0_pgsql
Fix pgsql : operator does not exist: timestamp without time zone ~~ u…
2018-10-30 12:31:04 +01:00
Laurent Destailleur
a8e6c3832e
Update list.php 2018-10-30 12:30:56 +01:00
Laurent Destailleur
7f1776c3a1
Merge pull request #9903 from atm-maxime/fix_loan_accounting
FIX default accounting accounts on loan creation #9643
2018-10-30 12:21:25 +01:00
John BOTELLA
1e819ca7c1 FIX special code on create supplier invoice from supplier order 2018-10-30 10:46:33 +01:00
John BOTELLA
ca47d1b8b1 Fix clone fourn order and invoice lines special code 2018-10-30 10:26:59 +01:00
Laurent Destailleur
8fbf5b1f33 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:28:19 +01:00
Laurent Destailleur
0266db7aa8 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:19:40 +01:00
Laurent Destailleur
d02fccd7e4 Fix deletion of draft invoice 2018-10-29 14:56:00 +01:00
Laurent Destailleur
824757bca6 Fix perm to delete 2018-10-29 14:47:33 +01:00
Laurent Destailleur
27d82d0e8e FIX Delete of draft invoice 2018-10-29 14:41:00 +01:00
Laurent Destailleur
85b8c9f219 FIX Delete of draft invoice 2018-10-29 14:35:42 +01:00
atm-ph
c83e67123d Fix pgsql : operator does not exist: timestamp without time zone ~~ unknown 2018-10-29 11:04:16 +01:00
Laurent Destailleur
04f80f0925 FIX Do not show check box if not applicable 2018-10-29 02:27:51 +01:00
Laurent Destailleur
553e984465 FIX Selection of addmaindocfile is lost on error 2018-10-29 02:14:41 +01:00
Laurent Destailleur
244c7f8dc3 FIX thirdparty property of object not loaded when only one record 2018-10-29 02:14:36 +01:00
Laurent Destailleur
6e3822345c Fix use setup of template for attached files in mass actions 2018-10-29 02:14:31 +01:00
Maxime Kohlhaas
b68b8fe412 Fix changing currency in a doc was recalculating amounts in company currency #9801 2018-10-28 11:02:51 +01:00
Maxime Kohlhaas
46d3bec104 Fix replenish wasn't caring about supplier price min quantity #9561 2018-10-28 10:25:56 +01:00
Maxime Kohlhaas
2fe4763570 Fix default accounting accounts on loan creation #9643 2018-10-28 09:22:55 +01:00
Librethic
fcd687642c
FIX: keep external module element when adding resource
When adding object from external module as a resource we need to keep @modulename as defined into url rather than use `element` property (which do not contain @modulename).
2018-10-27 11:46:12 +02:00
Maxime Kohlhaas
4ec80b5136 Fix invoice supplier clone was not getting all lines parameters #9800 2018-10-27 10:53:01 +02:00
Frédéric FRANCE
a30091fd74
Update commande.class.php 2018-10-27 09:51:19 +02:00
Laurent Destailleur
d800fe9256 FIX extrafields of taks not visible in creation 2018-10-26 16:21:01 +02:00
De Coninck Laurent
d347cf3a85 set a message 2018-10-26 16:18:27 +02:00
Philippe GRAND
f450e04856 Merge remote-tracking branch 'upstream/8.0' into 8.0 2018-10-26 15:38:15 +02:00
Laurent Destailleur
7c81124e66
Merge pull request #9869 from ATM-Marc/FIX_6.0_typhon_order_ref
FIX: pdf typhon: order reference duplicate
2018-10-26 15:18:19 +02:00
Laurent Destailleur
ed0393dfa8
Merge pull request #9875 from atm-john/Fix_title
FIX title
2018-10-26 15:14:44 +02:00
Laurent Destailleur
35421d135a FIX Total of timespent
Conflicts:
	htdocs/core/js/timesheet.js
2018-10-26 15:04:02 +02:00
atm-john
8a9b9f1736 Fix title 2018-10-25 21:53:48 +02:00
Marc de Lima Lucio
16c35035c1 FIX: pdf typhon: order reference duplicate 2018-10-25 12:07:40 +02:00
Laurent Destailleur
f44162715e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:31:04 +02:00