Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-30 13:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,809 Commits 37 Branches 191 Tags
f1791b5bf4e91e7f5864b1094e3fd7b5ae0af25f
Commit Graph

4581 Commits

Author SHA1 Message Date
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/modules/modFournisseur.class.php
 2017-09-25 19:54:27 +02:00
Laurent Destailleur
4c7b39f49e FIX #7486 Empty value for multicurrency rate must be forbidden 2017-09-25 19:22:41 +02:00
Laurent Destailleur
cef7b9c92d FIX #7435 Can't add payment term 2017-09-25 00:08:26 +02:00
Regis Houssin
06ee9f4775 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-24 16:10:55 +02:00
Laurent Destailleur
91d303465d NEW Can add html content on right of tabs 2017-09-24 01:39:06 +02:00
Regis Houssin
791c385e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ldap

Conflicts:
	htdocs/adherents/card.php
 2017-09-22 20:26:22 +02:00
Laurent Destailleur
f990667b1a NEW Can send email from the member card using email templates. 2017-09-22 17:48:38 +02:00
Laurent Destailleur
d4bde2a4ea Fix date substitution for contracts 2017-09-22 15:12:36 +02:00
Laurent Destailleur
252f038468 Mutualize code of substitutions for emails 2017-09-22 14:34:31 +02:00
Laurent Destailleur
236cf853e5 Sort list of invoice template 2017-09-22 11:47:36 +02:00
Laurent Destailleur
292095f0c6 NEW Can filter on type of email template 2017-09-22 10:11:51 +02:00
Regis Houssin
1f59e4f7e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-20 12:47:35 +02:00
Laurent Destailleur
cfd29841e1 NEW Option STOCK_SUPPORTS_SERVICES become visible. 2017-09-19 23:42:20 +02:00
Laurent Destailleur
c38ed54990 Disable old datepicker 2017-09-19 17:31:37 +02:00
Laurent Destailleur
278bcfa8da FIX #7148 2017-09-18 15:31:22 +02:00
Regis Houssin
f550e27579 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-18 12:15:01 +02:00
Regis Houssin
bb0cb8adf4 Fix: remove unused file 2017-09-18 11:04:55 +02:00
Regis Houssin
8389555882 Fix: wrong image url and file not present 2017-09-18 10:33:54 +02:00
Laurent Destailleur
e244ee6715 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-17 21:17:04 +02:00
Laurent Destailleur
2c3428a1bf Fix css 2017-09-17 20:48:09 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Regis Houssin
1f88e624c2 Fix: add ldap import/export script 2017-09-17 10:42:00 +02:00
Regis Houssin
bdc425c203 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd NEW add members types ldap group management 2017-09-16 21:41:30 +02:00
Laurent Destailleur
b099e0a135 Fix translation of dolistore interface 2017-09-16 10:42:23 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
Laurent Destailleur
c930ba1669 Merge pull request #7403 from hregis/develop_bug 
Fix: avoid Warning: A non-numeric value encountered
 2017-09-15 15:52:25 +02:00
Regis Houssin
25cd1ee27a Fix: avoid Warning: A non-numeric value encountered 2017-09-15 11:19:19 +02:00
Regis Houssin
a213a5d5fd Fix: missing empty $object 2017-09-15 11:12:56 +02:00
Regis Houssin
b9e0879847 NEW: Add hook addAdminLdapOptions and doAction in ldap admin page 
NEW: complete_head_from_modules() in ldap_prepare_head()
 2017-09-15 10:57:22 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
3b40c95107 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
 2017-09-14 21:57:14 +02:00
Laurent Destailleur
205989b64b Fix phpunit 2017-09-14 09:16:57 +02:00
Laurent Destailleur
51e5959765 Fix travis 2017-09-14 08:26:13 +02:00
Laurent Destailleur
1a056d29d2 Debug search on dolistore 2017-09-12 21:02:18 +02:00
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
 2017-09-12 13:26:25 +02:00
Laurent Destailleur
d0a0bf57b6 NEW The "Show detail by account" accepts 3 values: yes, no, if non zero 2017-09-12 12:52:48 +02:00
Laurent Destailleur
31b5ca17f1 Merge pull request #7353 from hregis/6.0_htmlentities 
Fix: avoid htmlentities
 2017-09-11 14:08:37 +02:00
Laurent Destailleur
e9e6a8e5ad Fix center of button 2017-09-11 03:29:36 +02:00
Laurent Destailleur
903df90f8a NEW Can edit with delete/insert a forced translation 2017-09-10 22:46:08 +02:00
Regis Houssin
7404a6cf98 Fix: avoid htmlentities 2017-09-09 12:15:59 +02:00
Laurent Destailleur
75172966c2 Fix selection of email templates 2017-09-08 14:40:39 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
152416a6d7 Fix bad param 2017-09-08 13:24:10 +02:00
Laurent Destailleur
b7197530c2 NEW Each user can edit its own email template (menu tools) 2017-09-08 12:48:01 +02:00
Laurent Destailleur
835cd43565 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-08 10:09:41 +02:00
Laurent Destailleur
7dbd0bd355 FIX Some page of admin were not responsive 2017-09-08 10:09:22 +02:00
Laurent Destailleur
f92eded0a2 Merge pull request #7340 from Oeris/6.0-ficheinter 
NEW Adds an option to hide duration in the "intervention" module
 2017-09-07 18:07:14 +02:00
Laurent Destailleur
b9af2d6b97 Merge pull request #7331 from simnandez/6.0 
FIX: Bad const name
 2017-09-07 17:57:33 +02:00