Commit Graph

5780 Commits

Author SHA1 Message Date
Abbes Bahfir
dccc8b0be3 Fix:Same action in both cases 2019-04-24 08:48:36 +01:00
Laurent Destailleur
3b04d2fe9b Fix warnings 2019-04-23 13:21:17 +02:00
Laurent Destailleur
7f4b09c482 Fix warnings 2019-04-23 13:20:44 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
84ec39f043 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-23 12:25:53 +02:00
Laurent Destailleur
bf7fcce1b2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-23 12:24:25 +02:00
florian HENRY
f412ce6a9c fix #11023 2019-04-17 10:49:39 +02:00
Laurent Destailleur
e6ffaeefe5 CSS 2019-04-17 10:39:30 +02:00
Laurent Destailleur
212b058f46 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-17 01:18:46 +02:00
Laurent Destailleur
b5bf6830e9 Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
media added from filemanager in notes are visible by PDFs builder.
2019-04-17 01:13:59 +02:00
Laurent Destailleur
5c53044863 Merge pull request #11024 from ATM-Marc/FIX_7.0_sort_events
FIX: actioncomm: sort events by date after external calendars and hook
2019-04-16 23:28:30 +02:00
Laurent Destailleur
c0defe3965 Update index.php 2019-04-16 23:27:45 +02:00
Marc de Lima Lucio
1669d497b4 FIX: actioncomm: sort events by date after external calendars and hook 2019-04-16 17:36:27 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Frédéric FRANCE
4d43cd4927 Update card.php 2019-04-05 14:46:31 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Laurent Destailleur
661a984b8e Merge pull request #10880 from altatof/condpay
allow empty value for payment conditions like in orders
2019-03-26 20:53:20 +01:00
Laurent Destailleur
a34f4c2806 Merge pull request #10909 from IonAgorria/fix-line-dates
FIX: Disallow line start date after end date
2019-03-26 19:43:11 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
a7181750c6 Merge pull request #10879 from altatof/noconcatdesc
NEW : add constant NO_CONCAT_DESCRIPTION
2019-03-22 12:56:46 +01:00
Philippe GRAND
62d63e399e translation 2019-03-22 09:41:22 +01:00
Laurent Destailleur
48a0c447b4 Fix test on draft status regression 2019-03-21 21:00:06 +01:00
Laurent Destailleur
930720decd WIP Start to replace use of property ->brouillon 2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412 NEW Add trigget FICHINTER_UNVALIDATE
Standardize code of setDraft.
2019-03-21 17:37:56 +01:00
Frédéric FRANCE
013e536f32 Update actioncomm.class.php 2019-03-19 12:49:54 +01:00
Laurent Destailleur
b10690ce88 Merge pull request #10874 from grandoc/translation
translation
2019-03-19 11:14:40 +01:00
Christophe Battarel
bd542b6b22 allow empty value for payment conditions like in orders 2019-03-18 16:39:59 +01:00
Christophe Battarel
8b3fd2eacf NEW : add constant NO_CONCAT_DESCRIPTION 2019-03-18 16:10:17 +01:00
Philippe GRAND
0f03b16313 translation 2019-03-18 12:46:32 +01:00
Philippe Grand
7942903548 Update actioncomm.class.php 2019-03-18 12:24:16 +01:00
Philippe GRAND
76a4792cd2 Merge remote-tracking branch 'upstream/develop' into new_branch_18_03_2019 2019-03-18 12:11:57 +01:00
Laurent Destailleur
de554750e4 Merge pull request #10802 from altatof/propindex
Harmonize propal index pages
2019-03-18 10:56:10 +01:00
Laurent Destailleur
22d61cd44d Update index.php 2019-03-18 10:55:44 +01:00
Laurent Destailleur
7adba419fc Update index.php 2019-03-18 10:54:45 +01:00
Laurent Destailleur
d8c1a50291 Update index.php 2019-03-18 10:53:58 +01:00
Philippe GRAND
198cf4af2f add comments 2019-03-18 10:06:22 +01:00
Laurent Destailleur
7cdfff7263 Fix syntax error 2019-03-15 20:42:49 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
0afbd70c2c Merge pull request #10833 from grandoc/new_branch_14_03_2019
update with html5 compliant code
2019-03-14 18:04:06 +01:00
Laurent Destailleur
d4f2a16abf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
2019-03-14 17:10:58 +01:00
Laurent Destailleur
cdf6e4b65a Fix some PSR rules 2019-03-14 16:43:27 +01:00
John BOTELLA
31e588dbab fix hookmanager global 2019-03-14 16:13:32 +01:00
John BOTELLA
8bc795c055 Fix missing hook for export agenda 2019-03-14 15:19:38 +01:00
Philippe GRAND
43b827aae7 update with html5 compliant code 2019-03-14 14:07:26 +01:00
Laurent Destailleur
e7cd8d690c Remove warnings 2019-03-13 19:06:45 +01:00
Laurent Destailleur
eeafc3c630 Standardize translation of amount 2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00