Commit Graph

22523 Commits

Author SHA1 Message Date
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
0241817217 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 21:12:36 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
Laurent Destailleur
d834f6023d Fix rounding 2020-12-31 16:06:54 +01:00
Laurent Destailleur
f756f575a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-31 15:19:49 +01:00
Laurent Destailleur
e4600b2091 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-31 15:17:03 +01:00
Laurent Destailleur
9e8c6eb0a1 FIX #15849 2020-12-31 15:05:17 +01:00
stickler-ci
327ec211c4 Fixing style errors. 2020-12-31 09:49:27 +00:00
Frédéric FRANCE
a5e0352031
modify animation speed of tooltips 2020-12-30 21:18:12 +01:00
Laurent Destailleur
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping
Dev multifilter jounal on bookeping
2020-12-30 13:19:27 +01:00
Laurent Destailleur
7165bd43d9
Update modAccounting.class.php 2020-12-30 13:17:57 +01:00
Laurent Destailleur
8149478c77
Merge pull request #15308 from aspangaro/14a2
NEW: Dictionary for availability - Add column position
2020-12-30 13:12:27 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +01:00
Laurent Destailleur
057945f693 Fix bad var 2020-12-29 17:04:39 +01:00
Laurent Destailleur
740cedeaac
Merge pull request #15824 from frederic34/scheduledjobs
remove warnings
2020-12-29 17:03:17 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56:39 +01:00
Alexandre SPANGARO
9f0434eb69 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-12-29 04:50:32 +01:00
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +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
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Frédéric FRANCE
08bad6fc30
remove warnings 2020-12-28 20:54:29 +01:00
Laurent Destailleur
8b696ced3b Clean code 2020-12-28 12:38:33 +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
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
4ec78d029b Fix warning 2020-12-27 19:21:37 +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
stickler-ci
7f1d0b9dc2 Fixing style errors. 2020-12-24 14:06:55 +00:00
Florian HENRY
1b6a4fc4ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction 2020-12-24 15:00:15 +01:00
Florian HENRY
79fe5ee34c actioncomm ok 2020-12-24 14:35:40 +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
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
055a2b6fec on goung 2020-12-23 23:44:38 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
02daf09928 Fix for php8 2020-12-23 23:06:34 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
1c73d38093 Fix api to download for shipments 2020-12-23 19:16:15 +01:00
Laurent Destailleur
9007e7be2a Fix sql for postgresql 2020-12-23 16:13:45 +01:00
Laurent Destailleur
70df6130b5 Fix SQL to export categories of contact
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Conflicts:
	htdocs/product/class/product.class.php
2020-12-23 15:45:33 +01:00
Laurent Destailleur
bf606ede12 Enhance remote ip detection 2020-12-23 13:27:30 +01:00
Laurent Destailleur
335eefe620 Fix link 2020-12-23 13:26:39 +01:00
Laurent Destailleur
53c6d92b0b Enhance remote ip detection 2020-12-23 13:17:40 +01:00
Laurent Destailleur
04d249cef0
Merge pull request #15792 from frederic34/notifications
simplify notications class
2020-12-21 18:14:04 +01:00