Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
88,616 Commits 35 Branches 179 Tags 1.7 GiB
815269db9c
Commit Graph

6174 Commits

Author SHA1 Message Date
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact 
FIX Saving contacts of an events
 2020-08-23 02:38:56 +02:00
Laurent Destailleur
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +02:00
Laurent Destailleur
461c37c4a8 Clean code 2020-08-21 01:28:40 +02:00
Laurent Destailleur
3ebcd191bd NEW Add filter rules "is answer" and "is not answer" in email collector 2020-08-20 20:16:38 +02:00
Laurent Destailleur
3281d5ec17
Merge pull request #14451 from josemariagomezroncero/patch-7 
Bug, this option disable topic input.
 2020-08-19 14:38:51 +02:00
Laurent Destailleur
4edf190264
Update mails_templates.php 2020-08-19 14:38:02 +02:00
Laurent Destailleur
afe8f76a4a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/stock.php
 2020-08-18 15:41:57 +02:00
Laurent Destailleur
d4a502629e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/stock.php
	htdocs/core/lib/ajax.lib.php
 2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d FIX Setup of stock increase/decrease 2020-08-18 15:27:17 +02:00
Laurent Destailleur
2f18ab0ea9 Debug generation of document for warehouse 2020-08-18 14:55:56 +02:00
Laurent Destailleur
6ce9d573e2 Trans 2020-08-18 14:13:36 +02:00
Laurent Destailleur
0172b76ea3 Add class reposition on some buttons 2020-08-18 14:05:35 +02:00
Laurent Destailleur
58e25768a7 NEW Add PDF document templates for warehouses (list of stock) 2020-08-18 14:02:36 +02:00
Laurent Destailleur
e3beec3e1f Fix css 2020-08-17 20:57:44 +02:00
Laurent Destailleur
bd65e5612f Fix duplicate id 2020-08-17 20:06:01 +02:00
Laurent Destailleur
75d368b706 Better translation of option 2020-08-17 14:08:52 +02:00
Laurent Destailleur
657e6a2037 No warning 2020-08-16 23:14:53 +02:00
Laurent Destailleur
4c0785e996 FIX #14469 2020-08-16 23:13:27 +02:00
josemariagomezroncero
134bd11f47
Update mails_templates.php 2020-08-14 21:19:51 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
josemariagomezroncero
308dea92b3
Bug, this option disable topic input. 
Bug, MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES disable topic input. We need the subject for email for save.
 2020-08-10 20:40:11 +02:00
Laurent Destailleur
537b58b446 Introduce workaround to allow integrator to suggest list of modules in 
old style by default instead of kanban style #14075
 2020-08-08 02:34:22 +02:00
Laurent Destailleur
71a6cf1207 Fix permission on type of email templates must depends on user perms. 
Conflicts:
	htdocs/admin/mails_templates.php
 2020-08-07 14:39:30 +02:00
Laurent Destailleur
5e90286a2e Fix permission on type of email templates must depends on user perms. 2020-08-07 14:38:03 +02:00
Laurent Destailleur
6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-08-07 11:59:55 +02:00
Laurent Destailleur
edd19419ad Add protection to allow only jpg and png as image file 2020-08-06 17:39:36 +02:00
Laurent Destailleur
61e194bb6d Add protection to allow only jpg and png as image file 2020-08-06 17:37:00 +02:00
Laurent Destailleur
c2b03e49e1 Fix logo not visible in setup page 2020-08-06 17:28:57 +02:00
Laurent Destailleur
aa696d8343 Show warning in kanban view 2020-08-03 15:17:37 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
 2020-08-03 14:44:01 +02:00
Laurent Destailleur
b6a3938921 FIX Size of image on the help popup of modules 2020-08-03 14:32:42 +02:00
Laurent Destailleur
55f3a8b4f8 Fix col size too large by migrating to dynamic format on tables 2020-08-03 11:37:55 +02:00
Laurent Destailleur
4afdfdda53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
 2020-08-02 22:42:17 +02:00
Laurent Destailleur
c35a103694 Fix phpcs 2020-08-02 22:40:17 +02:00
Laurent Destailleur
d9818405c6 Fix regression for v13 2020-08-02 22:30:23 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact 
NEW: Add prospect status managment for the contact with managment of custom icon
 2020-08-02 22:01:00 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Laurent Destailleur
f80b54e573 Debug setup of receipt printer module 2020-07-31 13:44:55 +02:00
Laurent Destailleur
d4e21538db FIX Debug setup of receipt printer module 2020-07-31 13:40:36 +02:00
Laurent Destailleur
81cb5501bc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
 2020-07-28 10:32:27 +02:00
Laurent Destailleur
45eca85bae Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2020-07-28 10:29:14 +02:00
Laurent Destailleur
d46d34915e FIX Checkbox "drop table" was not checked when using php method for dump 2020-07-28 10:23:09 +02:00
Laurent Destailleur
4e4f0a4575 Use same case for all sql files 2020-07-28 09:44:48 +02:00
Laurent Destailleur
fef180cf86 Fix scrutinizer errors 2020-07-28 02:54:37 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
9798bb1b30 Fix responsive 2020-07-27 02:29:16 +02:00
Laurent Destailleur
0011e09248 FIX Setup of clicktodial hang on smartphone 2020-07-27 02:29:11 +02:00
Laurent Destailleur
8cd4636de7 Fix responsive 2020-07-27 02:27:27 +02:00
Laurent Destailleur
2e19da3e6a FIX Setup of clicktodial hang on smartphone 2020-07-27 02:25:09 +02:00