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

61810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurélien
a350a06755 Solve bug with alias name display 
The bug display the alias name on the following name between brackets after name column.
 2017-09-25 21:15:35 +02:00
Laurent Destailleur
f1791b5bf4 Better translation 2017-09-25 19:58:38 +02:00
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
3cc7f66e90 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-09-25 19:48:42 +02:00
Laurent Destailleur
919d29fdf7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-25 19:45:40 +02:00
Laurent Destailleur
fe55feb82f FIX #7461 2017-09-25 19:45:01 +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
698b13a229 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-25 19:08:29 +02:00
Laurent Destailleur
58bc30ae9a Add indian vat 2017-09-25 19:08:17 +02:00
Laurent Destailleur
845a33653a Fix translation 2017-09-25 19:07:57 +02:00
Laurent Destailleur
051ca6fdc4 Merge pull request #7162 from hguibourgdev/patch-5 
NEW Can show stock in alert even if alter is set to 0
 2017-09-25 18:17:18 +02:00
Laurent Destailleur
278f37fe5a Merge pull request #7485 from hregis/develop_trad 
Fix: uniformize code
 2017-09-25 18:13:58 +02:00
Laurent Destailleur
dc362fcd30 NEW Can show currency in list of bank accounts 2017-09-25 18:11:03 +02:00
Laurent Destailleur
fcdbc66bb1 Merge pull request #7122 from atm-florian/develop_fixtransfert 
NEW : Can transfer from bank account to bank account with different currencies
 2017-09-25 17:36:52 +02:00
Laurent Destailleur
aeeda250c7 Merge pull request #7443 from salnaSrc/myFixes 
Add hidden option WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS
 2017-09-25 17:28:28 +02:00
Laurent Destailleur
4504fd8c48 Merge pull request #7483 from peckpeck/permit_any_variant_separator 
NEW Add a parameter to specify char used as separator for variant product label
 2017-09-25 17:20:29 +02:00
Laurent Destailleur
d2c23ebc8d Merge pull request #7484 from inoveaconseil/patch-11 
Fix quote in input
 2017-09-25 17:19:08 +02:00
Regis Houssin
16941f1d9d Fix: uniformize code 2017-09-25 16:46:13 +02:00
Inovea Conseil
35ae0e435d Fix quote in input 
Delete a quote in input field
 2017-09-25 16:14:14 +02:00
Benoît Peccatte
0ffffa3019 Add a parameter to specify variant identifier separator 2017-09-25 12:05:12 +02:00
Laurent Destailleur
7b9facc76a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-25 11:43:12 +02:00
Laurent Destailleur
a9fabf117e Code comment 2017-09-25 11:42:59 +02:00
Laurent Destailleur
53d931dd11 Merge pull request #7481 from dolibarr95/patch-17 
Fix 7470
 2017-09-25 11:34:00 +02:00
Laurent Destailleur
485b1ba88e Merge pull request #7482 from inoveaconseil/patch-10 
FIX Missing space in request
 2017-09-25 11:31:22 +02:00
Laurent Destailleur
c3e6577609 Merge pull request #7416 from hregis/develop_ldap 
NEW add members types ldap group management
 2017-09-25 11:30:35 +02:00
Inovea Conseil
d3d6fca350 Missing space in request 
Fix bug in request
 2017-09-25 10:49:56 +02:00
dolibarr95
6ee15f1c45 Fix 7470 
php warning when  MAIN_MODULE_xxxxx_DIR exists but the module does not have a directory.
 2017-09-25 09:01:47 +02:00
Regis Houssin
92ff974c5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-25 06:47:34 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
cef7b9c92d FIX #7435 Can't add payment term 2017-09-25 00:08:26 +02:00
Laurent Destailleur
4b92e2a705 Fix localtax 2017-09-24 23:55:44 +02:00
Laurent Destailleur
3f9cae745c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-24 23:40:57 +02:00
Laurent Destailleur
af384f14ae FIX #7477 2017-09-24 23:40:42 +02:00
Laurent Destailleur
270aba99fa FIX #7471 2017-09-24 23:28:48 +02:00
Laurent Destailleur
adb3827d1e FIX #7475 2017-09-24 22:55:27 +02:00
Laurent Destailleur
554a640c2b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-24 22:38:43 +02:00
Laurent Destailleur
3a7aea48d7 FIX #7475 2017-09-24 22:38:18 +02:00
Laurent Destailleur
1bb5408d83 FIX #7464 2017-09-24 22:18:10 +02:00
Laurent Destailleur
cee57129d6 Merge pull request #7467 from Oeris/6.0-api 
NEW get and post lines of an invoice using the REST API
 2017-09-24 22:01:33 +02:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
Laurent Destailleur
ddefdd12fb Merge pull request #7460 from dvasseur/develop 
FIX: REST API, date field not used for invoices creation
 2017-09-24 21:56:41 +02:00
Laurent Destailleur
73494a23df Merge pull request #7457 from atm-florian/6.0 
fix on ressrouce list and contract class
 2017-09-24 21:55:37 +02:00
Laurent Destailleur
ef61407d95 Merge pull request #7459 from fmarcet/4.0 
Fix: #7358 User can't create holiday requests
 2017-09-24 21:54:33 +02:00
Laurent Destailleur
5776a948c4 Update card.php 2017-09-24 21:54:26 +02:00
Laurent Destailleur
84173f3759 Merge pull request #7455 from fmarcet/6.0 
FIX Stripe not working on live mode
 2017-09-24 21:53:38 +02:00
Laurent Destailleur
707c8fde5e Merge pull request #7474 from hregis/develop_trad 
Fix: phpcs error
 2017-09-24 21:47:31 +02:00
Laurent Destailleur
2285e9bc0b Merge branch 'develop' into develop_trad 2017-09-24 21:47:17 +02:00
Laurent Destailleur
971e59395c Fix phpcs 2017-09-24 21:46:14 +02:00
Laurent Destailleur
7a6180858e Fix phpunit 2017-09-24 21:12:50 +02:00