Commit Graph

72858 Commits

Author SHA1 Message Date
Laurent Destailleur
f34d96b5fb
Merge pull request #11475 from atm-lena/9.0_fix_help_text
FIX help text
2019-07-13 23:32:35 +03:00
Laurent Destailleur
db2e1d88a3
Merge pull request #11499 from hregis/9.0_bug2
FIX __INFOS__ tag not exists
2019-07-13 22:48:05 +03:00
Regis Houssin
332abd2a9f FIX __INFOS__ tag not exists 2019-07-13 11:02:45 +02:00
atm-lena
a3f5397988 FIX help text 2 2019-07-10 15:55:50 +02:00
atm-lena
cebf81a514 FIX helpp text 2019-07-10 15:18:25 +02:00
Laurent Destailleur
8b0b824471 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-04 12:22:48 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/comm/action/card.php
2019-07-04 12:22:40 +02:00
Laurent Destailleur
f8de11492e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:25 +02:00
Laurent Destailleur
bc309ace38 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:16 +02:00
Laurent Destailleur
d04b19549e
Merge pull request #11453 from atm-greg/FIX_9.0_selectForFormsList_for_invoices
fix case objecttmp is an invoice in selectForFormsList
2019-07-04 12:20:56 +02:00
Laurent Destailleur
63c93be94e
Update html.form.class.php 2019-07-04 12:20:34 +02:00
Laurent Destailleur
a9dfca70cf
Merge pull request #11452 from atm-florianm/FIX_minor_spelling_issues
FIX: minor spelling issues
2019-07-04 12:19:26 +02:00
Laurent Destailleur
554c76e232
Merge pull request #11451 from fmarcet/8.0
FIX: When saving an action it didn't save the label based on the type of event
2019-07-04 12:18:08 +02:00
Laurent Destailleur
125c2a65c0
Merge pull request #11445 from atm-john/9.0_fix_dictionary
Fix missing hidden input and short label
2019-07-04 10:54:16 +02:00
Laurent Destailleur
2035cbaee1
Merge pull request #11440 from atm-maxime/7.0
Fix wrong column for filters on invoice template list
2019-07-04 10:46:49 +02:00
Laurent Destailleur
5fde7da183
Merge pull request #11439 from atm-quentin/FIX_empty_product_use_units
FIX empty product_use_units in product configuration
2019-07-04 10:38:15 +02:00
atm-greg
2f5b9ccb22 fix case objecttmp is an invoice 2019-07-03 17:00:18 +02:00
atm-florian.m
3e53a06b2e minor spelling issues 2019-07-03 16:17:47 +02:00
Ferran Marcet
433835860c FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized 2019-07-03 13:12:41 +02:00
Laurent Destailleur
9d50c67208 FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export 2019-07-02 18:06:51 +02:00
John Botella
a75a2ae8e4 Fix missing hidden input and short label 2019-07-02 15:44:42 +02:00
Maxime Kohlhaas
6b43c325c7 Fix wrong column for filters on invoice template list 2019-07-02 10:53:47 +02:00
atm-quentin
8cdb251ca5 FIX product_use_units was set to 0 each time a conf in block other was set 2019-07-02 10:18:03 +02:00
Laurent Destailleur
ef27e32f53 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/filefunc.inc.php
2019-07-01 13:27:57 +02:00
Laurent Destailleur
3abaecfd77 Prepare 8.0.7 2019-07-01 13:27:18 +02:00
Laurent Destailleur
6537faa35e Fix merge 2019-06-29 23:26:14 +02:00
Laurent Destailleur
0aeb27ba97 Fix merge 2019-06-29 23:25:07 +02:00
Laurent Destailleur
fb42333b3e Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-06-29 23:20:07 +02:00
Laurent Destailleur
81bb85c4df Merge 2019-06-29 23:19:47 +02:00
Laurent Destailleur
fdc958a172 Fix launch of ISCC.ex if not into path 2019-06-29 23:17:36 +02:00
Laurent Destailleur
854bbf8405 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-28 14:09:00 +02:00
Laurent Destailleur
58a7640dc3
Merge pull request #11417 from atm-maxime/7.0
Fix invoice list filter on withdrawal card
2019-06-28 12:41:13 +02:00
Laurent Destailleur
a8837f5645
Merge pull request #11413 from atm-quentin/FIX_ending_slash
FIX ending slash
2019-06-27 20:23:22 +02:00
Maxime Kohlhaas
fc1d4704a5 Fix invoice list filter on withdrawal card 2019-06-27 17:33:47 +02:00
Laurent Destailleur
abbc9062ef Merge 2019-06-27 13:54:31 +02:00
Laurent Destailleur
fa986e311d Merge 2019-06-27 13:45:21 +02:00
Laurent Destailleur
d69b20311b FIX If the replacement invoice has been deleted we can reopen 2019-06-27 01:13:46 +02:00
Laurent Destailleur
be695a8e1a Fix link for situations 2019-06-27 00:51:03 +02:00
Laurent Destailleur
244d21bd2b Fix trans 2019-06-27 00:45:17 +02:00
Laurent Destailleur
12d3a7021f Prepare 8.0.5 2019-06-26 18:50:31 +02:00
atm-quentin
49db277368 FIX ending slash 2019-06-26 16:42:14 +02:00
Laurent Destailleur
f2ea78f2ec Removed useless files 2019-06-25 23:26:55 +02:00
Laurent Destailleur
70319031ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-25 23:21:10 +02:00
Laurent Destailleur
07fb930a79 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-25 23:20:27 +02:00
Laurent Destailleur
e1ee079254 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-06-25 23:20:07 +02:00
Laurent Destailleur
c5572e0176 Add info on signature generator 2019-06-25 23:19:00 +02:00
Laurent Destailleur
162498d2f8 Add info on signature generator 2019-06-25 23:18:20 +02:00
Laurent Destailleur
1ae9d94de9 Add info on signature generator 2019-06-25 23:15:30 +02:00
Laurent Destailleur
6790930283 Add info on signature generator 2019-06-25 23:11:49 +02:00
Laurent Destailleur
d5479cd9ae Fix import of ledger 2019-06-25 22:37:13 +02:00