lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,762 Commits 43 Branches 150 Tags 886 MiB
8214e7bb42
Commit Graph

64762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f4de75afc3 FIX Position of signature on strato template 2017-09-16 00:49:00 +02:00
Laurent Destailleur
087e22ab94 Fix bad status picto 2017-09-16 00:14:39 +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
Rui Strecht
39341f0095 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-15 18:52:14 +01:00
Laurent Destailleur
3c9532841f Fix regression db => this->db 2017-09-15 19:37:23 +02:00
Rui Strecht
36e634ae4c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-15 18:34:25 +01:00
Rui Strecht
33d00d508e Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into develop 2017-09-15 18:32:03 +01: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
48ae76e295 Fix picto on service 2017-09-15 19:13:40 +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
7b8699f54c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-15 18:56:30 +02:00
Laurent Destailleur
9d9d5d6dc8 Merge pull request #7399 from ptibogxiv/develop 
FIX multicompany
 2017-09-15 18:55:29 +02:00
Laurent Destailleur
59f644a3e2 FIX SEPA recording payment must save one payment in bank per customer 2017-09-15 18:39:10 +02:00
Regis Houssin
767240698f Fix: wrong var name 2017-09-15 18:31:22 +02:00
Regis Houssin
3ca90df524 Fix: translation 2017-09-15 18:21:50 +02:00
Regis Houssin
7f57f737b3 New: Ping ldap server before ldap_connect for avoid waiting 2017-09-15 18:02:52 +02:00
Regis Houssin
cbd8cb8cb7 Fix: missing merge conflict 2017-09-15 17:32:49 +02:00
Laurent Destailleur
17eec5f9e9 Fix look and field for direct debit notes 2017-09-15 17:23:41 +02:00
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +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
45b5819b8d Merge pull request #7409 from inoveaconseil/patch-9 
Accept the custom folder #7408
 2017-09-15 16:04:29 +02:00
Laurent Destailleur
97d5c067ac Merge pull request #7407 from atm-florian/5.0 
fix : advance target emailing
 2017-09-15 16:01:53 +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
Rui Strecht
1b30af4d0a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-15 14:34:43 +01:00
Inovea Conseil
9dfd4bb430 Accept the custom folder #7408 2017-09-15 14:40:51 +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
Rui Strecht
06b0146232 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-15 13:00:25 +01:00
Laurent Destailleur
1a78e2a055 Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
Rui Strecht
fd27c29354 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-15 12:32:32 +01:00
florian HENRY
ff7b542bfa fix : Avoid warning 2017-09-15 13:25:54 +02:00
florian HENRY
8b9b99ac40 fix : advance target emailing 2017-09-15 13:02:49 +02:00