Commit Graph

93495 Commits

Author SHA1 Message Date
Laurent Destailleur
e07486b626 Fix columns of download of list of targets of emailing 2020-12-29 02:20:10 +01:00
Laurent Destailleur
d9a2e2e402 Responsive 2020-12-29 02:06:42 +01:00
Florian HENRY
b3dae016af fix sticker 2020-12-28 21:38:17 +01:00
Florian HENRY
1e438b686e fix stickler 2020-12-28 21:32:46 +01:00
Florian HENRY
af860a32bc fix product right 2020-12-28 21:19:25 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Frédéric FRANCE
fb5f4379da
remove warnings 2020-12-28 21:08:56 +01:00
Frédéric FRANCE
08bad6fc30
remove warnings 2020-12-28 20:54:29 +01:00
Frédéric FRANCE
9b3bbb723d
remove warnings 2020-12-28 20:37:33 +01:00
lvessiller
d4a19e5968 NEW add total margin in invoice list 2020-12-28 16:20:59 +01:00
Laurent Destailleur
b7cd27e76a Fix warning 2020-12-28 12:42:55 +01:00
Laurent Destailleur
8b696ced3b Clean code 2020-12-28 12:38:33 +01:00
Laurent Destailleur
7c3688c66f Fix var not defined 2020-12-28 12:36:36 +01:00
Laurent Destailleur
4b3cd947f2 Fix name of function 2020-12-28 12:33:00 +01:00
Laurent Destailleur
cec96b33ae Fix warning 2020-12-28 12:30:59 +01:00
Alexandre SPANGARO
5001cfce71 NEW: Accountancy - Format FEC - Add new field DateLimitReglmt 2020-12-28 04:12:23 +01:00
Alexandre SPANGARO
abdb3a3f03 Merge remote-tracking branch 'upstream/develop' into 14a3 2020-12-28 03:49:01 +01:00
Alexandre SPANGARO
49a1268ba1 Merge branch '12.0' into 12p9 2020-12-28 03:12:57 +01:00
Alexandre SPANGARO
26791714ce Fix : Introduce constant ACCOUNTANCY_SHOW_OPENING_BALANCE 2020-12-28 03:07:33 +01:00
Laurent Destailleur
eac711f96c Debug v13 2020-12-27 21:41:39 +01:00
Laurent Destailleur
6421f757dc FIX Can delete a directory created manually that can not be indexed 2020-12-27 21:21:13 +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