lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,515 Commits 43 Branches 150 Tags 886 MiB
c2e1e2491d
Commit Graph

61515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre SPANGARO
c2e1e2491d Accountancy - Finish moving admin to specific menu & some cleaning 2017-09-16 06:53:29 +02:00
Laurent Destailleur
a6b600c8a1 Fix regression in unit tests 2017-09-16 03:54:23 +02:00
Laurent Destailleur
961d475a9d More complete substitution system. 
Add __CONTRACT_NEXT_EXPIRATION_DATE__  and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
 2017-09-16 03:45:29 +02:00
Laurent Destailleur
a4086b52ef NEW Can send email from contract card 2017-09-16 01:34:15 +02:00
Laurent Destailleur
b13dbf1f06 Clean code. Make selection of template working even if public. 2017-09-16 00:49:46 +02:00
Laurent Destailleur
f4de75afc3 FIX Position of signature on strato template 2017-09-16 00:49:00 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
Laurent Destailleur
ffb3823655 Allow null in stock alert threshold to be compatible with #7162 2017-09-15 23:38:03 +02:00
Laurent Destailleur
a8b4d216e5 Fix PHPCS 2017-09-15 23:21:42 +02:00
Laurent Destailleur
3c9532841f Fix regression db => this->db 2017-09-15 19:37:23 +02:00
Laurent Destailleur
ac1d701d6f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 19:22:24 +02:00
Laurent Destailleur
5fc255075e Merge pull request #7413 from hregis/develop_trad 
Fix: translation
 2017-09-15 19:21:51 +02:00
Laurent Destailleur
89993e0f3f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 19:09:02 +02:00
Laurent Destailleur
55e31796d2 Code comment 2017-09-15 19:08:39 +02:00
Laurent Destailleur
2fcedcad74 Merge pull request #7410 from atm-florian/dev_better_propal_singend_form 
NEW: confirm form style to accept or reject proposal
 2017-09-15 18:58:25 +02:00
Laurent Destailleur
b63b0933e7 Update card.php 2017-09-15 18:57:39 +02:00
Laurent Destailleur
9d9d5d6dc8 Merge pull request #7399 from ptibogxiv/develop 
FIX multicompany
 2017-09-15 18:55:29 +02:00
Regis Houssin
3ca90df524 Fix: translation 2017-09-15 18:21:50 +02:00
Laurent Destailleur
88397436c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 16:41:24 +02:00
Laurent Destailleur
a0e5868fd9 Fix typo 2017-09-15 16:41:10 +02:00
florian HENRY
c9df299418 NEW: confirm form style to accept or reject proposal 2017-09-15 16:06:25 +02:00
Laurent Destailleur
3debd0f49d Merge pull request #7406 from tysauron/patch-10 
Performance enhancement. Param to avoid loading all users of a user group
 2017-09-15 16:01:19 +02:00
Laurent Destailleur
6b2e8f3614 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 15:58:46 +02:00
Laurent Destailleur
56460f877e Merge pull request #7404 from atm-florian/dev_add_search_on_extrafield_contractline 
Add search on extrafields on contract service list
 2017-09-15 15:58:30 +02:00
Laurent Destailleur
3dbf4cf176 Update services.php 2017-09-15 15:58:02 +02:00
Laurent Destailleur
2b2c465311 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 15:57:20 +02:00
Laurent Destailleur
8dcd864477 Rename var $mode to avoid conflicts 2017-09-15 15:57:07 +02:00
Laurent Destailleur
3c7c53f321 Update services.php 2017-09-15 15:55:43 +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
Laurent Destailleur
25c4dba8a0 Merge pull request #7402 from hregis/develop_ldap 
NEW: Add hook addAdminLdapOptions and doAction in ldap admin page
 2017-09-15 15:51:38 +02:00
Laurent Destailleur
5f0819d3b4 Merge branch 'develop' into develop 2017-09-15 15:50:28 +02:00
Laurent Destailleur
a2b4e887bb Merge pull request #7405 from tysauron/patch-9 
Beaucoup beaucoup plus rapide
 2017-09-15 15:46:51 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
77056d9adb NEW All setup of accountancy can be done from menu "Accountancy-Setup" 2017-09-15 14:09:42 +02:00
Laurent Destailleur
1a78e2a055 Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
tysauron
4f15c90aee Pour ne pas charger les membres d'un groupe lorsque l'on charge les groupe d'un user (sinon avec 200 user et 30 groupes = 6000 objects . trop lourd) 2017-09-15 12:58:13 +02:00
tysauron
2abb38afdf Beaucoup beaucoup plus rapide 
Pour moi passe de 4 secondes a 0,8 (grosse base)
 2017-09-15 12:48:57 +02:00
florian HENRY
db319803ec add sreach on extrafeilds on contract service list 2017-09-15 12:17:18 +02:00
Laurent Destailleur
e254554461 Code comment 2017-09-15 11:28:21 +02:00
Laurent Destailleur
1ffcb5d94e FIX background color not visible in emailing view 2017-09-15 11:24:32 +02:00
Laurent Destailleur
0ade500535 Better support of text editor when no js available. 2017-09-15 11:19:56 +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
Laurent Destailleur
e02c220c08 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php
 2017-09-15 11:02:34 +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
f5d2283093 USe second parameter in GETPOST 2017-09-15 10:52:53 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
8f5206accf NEW The lot of a product uses the link and picto when shown into list. 2017-09-15 10:45:41 +02:00
ptibogxiv
5cba2f0daf Update list.php 2017-09-15 01:58:55 +02:00