Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-26 19:31:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,555 Commits 36 Branches 191 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

1133 Commits

Author SHA1 Message Date
Laurent Destailleur
e915e3403c Trans 2021-06-09 13:36:37 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
Laurent Destailleur
7860464724 Sync transifex 2021-05-05 01:48:21 +02:00
altairis-noe
f3ede35b4f lang correction 2021-04-29 13:18:14 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
07cd751c59 batch status dictionnary 2021-04-20 15:51:02 +02:00
Laurent Destailleur
39654260d6 Sync transifex 2021-04-20 00:45:48 +02:00
Laurent Destailleur
77bb5b78b6 Show swagger json file of APIs 2021-03-26 13:57:16 +01:00
Laurent Destailleur
50797bf892 Fix typo 2021-02-12 17:17:48 +01:00
Laurent Destailleur
cd4d790d2b Add parameters of batch into comment description 2021-02-12 17:15:23 +01:00
Laurent Destailleur
599d69b07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-22 13:40:08 +01:00
Laurent Destailleur
79fb672674 Sync transifex 2021-01-22 01:47:29 +01:00
Laurent Destailleur
8e5b971c49 Merge pull request #15918 from zuiko/patch-1 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
 2021-01-21 13:33:47 +01:00
Laurent Destailleur
16d98d2691 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:09:09 +01:00
Laurent Destailleur
768d2db8a1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 13:43:48 +01:00
Laurent Destailleur
df3034d13a Merge branch 'develop' into patch-1 2021-01-11 17:15:46 +01:00
atm-lena
f17474a8de 12.0 FIX Translation Permission777 FR 2021-01-11 16:56:19 +01:00
Laurent Destailleur
69c614ec2a Sync transifex 2021-01-08 11:22:11 +01:00
zuiko
e861248af8 Update admin.lang 
Fix #15633
 2021-01-06 23:37:58 +01:00
Laurent Destailleur
3443174f67 Sync transifex 2020-11-30 18:28:04 +01:00
Laurent Destailleur
32ae1bf350 Sync transifex 2020-11-18 15:56:06 +01:00
kamel
73b35f334e NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox) 
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 2020-11-18 09:41:42 +01:00
kkhelifa-opendsi
1f5f784b75 Merge branch 'develop' into email_smtp_allow_auto_signed 2020-09-14 10:25:15 +02:00
Laurent Destailleur
7d25de5713 Enhance setup page for email setup 2020-09-12 15:39:14 +02:00
kamel
ccff18e2a5 NEW : Email configuration - Allow auto signed certificat when ssl activated 2020-09-08 14:48:50 +02:00
Laurent Destailleur
d94d7a1d0b Sync transifex 2020-08-30 16:28:07 +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
d054aedc80 Sync language 2020-08-02 18:32:54 +02:00
kkhelifa-opendsi
fe0f77b967 Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Laurent Destailleur
d18ce3b39e Look and feel v12 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-07-05 12:54:42 +02:00
Laurent Destailleur
ade542eee7 Sync language 2020-06-18 10:05:00 +02:00
Laurent Destailleur
2b963479a8 Sync transifex 2020-05-23 23:50:00 +02:00
Anthony Berton
3644a718d8 1 2020-05-09 01:02:51 +02:00
Anthony Berton
fdb98dd6ed Update admin.lang 2020-05-03 10:49:57 +02:00
kamel
9cb90cb384 NEW: Add prospect status managment for the contact with managment of custom icon 2020-04-27 17:35:14 +02:00
Laurent Destailleur
0b790ef327 Sync lang files 2020-04-21 18:18:07 +02:00
Laurent Destailleur
f774733fcb Sync transifex 2020-03-14 00:14:42 +01:00
Laurent Destailleur
a02a2a6def Sync transifex 2020-01-27 16:07:53 +01:00
Laurent Destailleur
f9262b0dcf Transifex sync 2020-01-09 22:30:00 +01:00
Laurent Destailleur
f9c3b25dbd Sync transifex 2019-12-22 12:55:38 +01:00
Laurent Destailleur
ae6d536d1d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
 2019-12-09 13:32:56 +01:00
Florian Mortgat
4846885eea NEW 9.0: enable user to use the mysqldump '--quick' option 
(useful if the server has low RAM or large tables)
 2019-12-02 16:54:05 +01:00
altairis
699a3391c9 FCKeditor setup for tickets 2019-10-03 16:51:05 +02:00
Laurent Destailleur
434ab2965a Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy 
NEW check if a resource is in use in an event
 2019-09-15 15:47:07 +02:00
Abbes Bahfir
5183a1ec7a New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP 2019-09-11 22:45:52 +01:00
Laurent Destailleur
50957ab621 Sync transifex 2019-09-05 16:51:20 +02:00
VESSILLER
b70587c150 NEW check if a resource is in use in an event 2019-09-04 15:14:16 +02:00
Laurent Destailleur
e54dbecf6d Sync transifex 2019-08-30 04:17:40 +02:00
Laurent Destailleur
b3e9cf3be7 Sync transifex 2019-08-12 17:37:23 +02:00
Laurent Destailleur
907ba62054 Sync transifex 2019-07-24 14:59:03 +02:00