Commit Graph

93070 Commits

Author SHA1 Message Date
Alexandre SPANGARO
2932e2f804 NEW: Accountancy - Add formconfirm with options on export 2020-12-29 04:33:47 +01:00
Alexandre SPANGARO
5001cfce71 NEW: Accountancy - Format FEC - Add new field DateLimitReglmt 2020-12-28 04:12:23 +01:00
Laurent Destailleur
4a8e72c997 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ecm/file_card.php
2020-12-27 21:00:07 +01:00
Laurent Destailleur
d1d4914684 Sanitize data 2020-12-27 20:49:54 +01:00
Laurent Destailleur
6b03a2d264 Sanitize data 2020-12-27 20:49:40 +01:00
Laurent Destailleur
a6cd34739e Doxygen 2020-12-27 20:43:18 +01:00
Laurent Destailleur
e89a410e59 Fix warning 2020-12-27 20:33:07 +01:00
Laurent Destailleur
81ab33ff12 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/product/list.php
2020-12-27 19:40:03 +01:00
Laurent Destailleur
5aae018a0b Fix for php8 2020-12-27 19:33:07 +01:00
Laurent Destailleur
4ec78d029b Fix warning 2020-12-27 19:21:37 +01:00
Laurent Destailleur
5ff53691a5 Fix migration 2020-12-27 19:13:09 +01:00
Laurent Destailleur
96040980d7 Fix upgrade 2020-12-27 19:06:56 +01:00
Laurent Destailleur
12d8685b68 Prepare v14 2020-12-27 19:05:48 +01:00
Laurent Destailleur
a3cac7f5e5 Prepare v14 2020-12-27 19:03:13 +01:00
Laurent Destailleur
f8e611d492 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-27 19:02:46 +01:00
Laurent Destailleur
00c847b743 Fix warning 2020-12-27 16:56:44 +01:00
Laurent Destailleur
199b46cfaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/langs/en_US/modulebuilder.lang
2020-12-27 16:53:15 +01:00
Laurent Destailleur
5fc3a9ce7d Debug v13 2020-12-27 15:39:10 +01:00
Laurent Destailleur
30d2c8fb56 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-27 15:19:07 +01:00
Laurent Destailleur
f8b179a1be
Merge pull request #15351 from frederic34/patch-13
separate ref and rowid in members
2020-12-27 15:18:55 +01:00
Laurent Destailleur
e4d7ce371e Add file for #15351 2020-12-27 15:16:21 +01:00
Laurent Destailleur
4c9a597c8a
Update 12.0.0-13.0.0.sql 2020-12-27 15:13:20 +01:00
Laurent Destailleur
00c284794c
Merge pull request #15478 from StephaneLesage/catlist-icons-edit-delete
NEW: Add edit/delete action icons on categories list pages
2020-12-27 15:10:09 +01:00
Laurent Destailleur
28642238de Fix error message 2020-12-27 15:09:27 +01:00
Laurent Destailleur
7178918cb4
Merge pull request #15476 from StephaneLesage/fix-edit-category
Fix edition of tag/category which used type parameter instead of object's type
2020-12-27 15:08:50 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10
NEW add db fields note_public note_private for ecm
2020-12-27 15:07:51 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes
NEW Can toggle FCKeditor on public/private notes
2020-12-27 15:06:35 +01:00
Laurent Destailleur
895f59b9a7
Merge pull request #15765 from aspangaro/13b4
NEW: Accountancy - In ledger & journals, show link on bank transaction
2020-12-27 14:34:59 +01:00
Laurent Destailleur
56ff2ef010
Merge pull request #15566 from frederic34/mailingcard
remove warnings
2020-12-27 14:11:04 +01:00
Frédéric FRANCE
12f4a74a74
Merge remote-tracking branch 'upstream/develop' into mailingcard 2020-12-27 14:04:04 +01:00
Laurent Destailleur
d2af03856c
Merge pull request #15808 from FHenry/12.0
fix: colspan balance accountanty
2020-12-27 13:56:07 +01:00
Laurent Destailleur
a1d9554672
Merge pull request #15813 from dolibit-ut/patch-58
Update ChangeLog
2020-12-27 13:54:59 +01:00
Laurent Destailleur
4b5a42a805
Merge pull request #15816 from atm-maxime/new_modulebuilder_contacttab13
New modulebuilder contact tab
2020-12-27 13:17:18 +01:00
Laurent Destailleur
f20f4cc599 Fix warnings 2020-12-26 19:23:25 +01:00
Maxime Kohlhaas
22e0360575 Fix missing delete files in module builder 2020-12-25 11:53:13 +01:00
Maxime Kohlhaas
4cee1e8d79 Fix admin/myobject_extrafields page 2020-12-25 11:53:06 +01:00
Maxime Kohlhaas
214167b552 Add generation of admin/xxx_extrafields page 2020-12-25 11:53:00 +01:00
Maxime Kohlhaas
11146a0b66 Add contact tab in default generated php files 2020-12-25 11:52:34 +01:00
Laurent Destailleur
f98f9504f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-24 13:07:39 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
2020-12-24 13:05:17 +01:00
Laurent Destailleur
3abceadb86 Add info 2020-12-24 13:02:45 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Laurent Destailleur
360a85cbbc FIX add autofix of count of email target when data is corrupted 2020-12-24 12:32:34 +01:00
Laurent Destailleur
5382bf1dd4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-24 03:07:46 +01:00
Laurent Destailleur
a0440fbe88 Removed warnings 2020-12-24 03:06:52 +01:00
Laurent Destailleur
5ef3ffbdc6 Fix warning 2020-12-24 03:03:38 +01:00
Laurent Destailleur
6c2a17b29a Fix warning 2020-12-24 02:59:00 +01:00
Laurent Destailleur
3586da75a2 Fix warning 2020-12-24 02:52:49 +01:00
Laurent Destailleur
ea0ae758a3 Fix warnings 2020-12-24 02:48:32 +01:00
Laurent Destailleur
11a122176d Clean code 2020-12-24 02:33:11 +01:00