Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
ae2d92a797
Merge pull request #12050 from frederic34/patch-18
Update contrat.class.php for doxygen
2019-10-07 10:24:07 +02:00
Laurent Destailleur
d4f4f33122
Merge pull request #12048 from frederic34/patch-17
Update card.php
2019-10-07 10:23:51 +02:00
Laurent Destailleur
3d20766392
Merge pull request #12047 from frederic34/patch-15
translation for holidays actioncomm
2019-10-07 10:23:29 +02:00
Laurent Destailleur
80cbc09f21
Merge pull request #12046 from frederic34/apisupplierproduct
api supplier price delete
2019-10-07 10:22:48 +02:00
Laurent Destailleur
c3ae87816f
Merge pull request #12049 from frederic34/holidayz
lang file for holidays is holiday
2019-10-07 10:21:36 +02:00
Frédéric FRANCE
0b9213f4f1
Update contrat.class.php 2019-10-07 08:11:23 +02:00
Frédéric FRANCE
f80fa08a2d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-07 07:57:05 +02:00
Laurent Destailleur
edfedbb818 FIX Load chart of account only if we click or select button "Load chart" 2019-10-06 21:13:55 +02:00
Laurent Destailleur
80c1a92872 FIX Load chart of account only if we click or select button "Load chart" 2019-10-06 21:11:29 +02:00
Laurent Destailleur
52c06c1815 Fix css 2019-10-06 19:28:08 +02:00
Laurent Destailleur
a3d0b9e374 Fix syntax error 2019-10-06 18:11:28 +02:00
Laurent Destailleur
1285f71ceb Clean code of extrafields 2019-10-06 16:50:04 +02:00
Laurent Destailleur
753da4791e FIX Pb in units of shipments
Conflicts:
	htdocs/expedition/card.php
2019-10-06 16:31:17 +02:00
Laurent Destailleur
fb808d830e FIX Look and feel v10 2019-10-06 16:28:14 +02:00
Laurent Destailleur
6c1c008d09 FIX Look and feel v10 2019-10-06 16:28:10 +02:00
Laurent Destailleur
d4bb6490e9 Fix migration 2019-10-06 16:25:22 +02:00
Laurent Destailleur
5297ab4ab4 FIX Pb in units of shipments 2019-10-06 16:11:57 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-06 15:56:21 +02:00
Frédéric FRANCE
37f6aa3395
Update list.php 2019-10-06 15:52:33 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
f6cd3814ac FIX Look and feel v10 2019-10-06 15:08:05 +02:00
Laurent Destailleur
b83d4eb936 FIX Look and feel v10 2019-10-06 14:57:34 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
76dad97cb1 Fix syntax error 2019-10-06 14:39:43 +02:00
Laurent Destailleur
6743169faa Fix js syntax error 2019-10-06 14:34:24 +02:00
Frédéric FRANCE
52da21912b
Update agenda.lang 2019-10-06 13:21:04 +02:00
Frédéric FRANCE
8a9f08d5a3
lang file for holidays is holiday 2019-10-06 11:29:24 +02:00
Frédéric FRANCE
bfd8bc839e
Update card.php 2019-10-06 10:28:09 +02:00
Frédéric FRANCE
21dcc549fa
translation for holidays actioncomm 2019-10-06 10:09:06 +02:00
stickler-ci
1047a8ea0f Fixing style errors. 2019-10-05 20:25:17 +00:00
Maxime Kohlhaas
2068692f40 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_validators 2019-10-05 22:25:06 +02:00
Maxime Kohlhaas
848b9cc57a Translations 2019-10-05 22:24:59 +02:00
Maxime Kohlhaas
e70b487c34 Add info about validators saying default is supervisor 2019-10-05 22:22:55 +02:00
Frédéric FRANCE
b895f8a78f
api supplier get purchase prices 2019-10-05 21:19:55 +02:00
Frédéric FRANCE
10671e3266
api supplier price delete 2019-10-05 21:15:13 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com: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
2019-10-05 19:35:40 +02:00
Laurent Destailleur
ac8837d01f Fix url 2019-10-05 19:28:00 +02:00
Laurent Destailleur
7f5ccf4b8e Remove google+ 2019-10-05 19:27:14 +02:00
Laurent Destailleur
3e5cd877b8 FIX Bad list of ticket on public interface for ticket emailcollector 2019-10-05 14:27:42 +02:00
Laurent Destailleur
e90234c2bc FIX escape email alias 2019-10-05 14:27:37 +02:00
Laurent Destailleur
7c685bc76f FIX Bad list of ticket on public interface for ticket emailcollector 2019-10-05 14:25:20 +02:00
Laurent Destailleur
c36d49a8c3 FIX escape email alias 2019-10-05 14:15:14 +02:00
Laurent Destailleur
b053663fe6 Look and feel v11 2019-10-05 13:13:11 +02:00
Laurent Destailleur
083db12490 FIX access to public interface when origin email has an alias. 2019-10-05 11:53:08 +02:00
Laurent Destailleur
031c5523d4 NEW Add link to the public interface on the ticket card. 2019-10-05 11:52:30 +02:00
Laurent Destailleur
5c11a0d6cd FIX access to public interface when origin email has an alias. 2019-10-05 11:52:02 +02:00
Laurent Destailleur
a06b1b9f3f Fix escaping chars 2019-10-05 11:43:28 +02:00
Laurent Destailleur
827b1fe5d2 Use small image instead of mini for preview on document list 2019-10-05 11:17:09 +02:00
Laurent Destailleur
8bf9afb7ca FIX Attachement of linked files on ticket when sending a message 2019-10-04 19:41:35 +02:00