lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
62,587 Commits 43 Branches 150 Tags 886 MiB
6bd0550bdd
Commit Graph

62587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KHELIFA
dc87133e0b Fix carriage return when get full address formated for output on documents 2017-10-06 15:06:59 +02:00
Laurent Destailleur
ed467aa74b FIX Only modified values must be modified 2017-10-06 15:01:31 +02:00
Laurent Destailleur
1becbb8805 Fix bad date on time spent view 2017-10-06 14:38:33 +02:00
Laurent Destailleur
afc1938676 FIX #7550 2017-10-06 14:28:01 +02:00
Laurent Destailleur
f9d9642340 FIX #6981 2017-10-06 14:07:28 +02:00
Laurent Destailleur
5411699256 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-06 13:57:12 +02:00
Laurent Destailleur
8ce723b4c9 FIX #7514 2017-10-06 13:56:54 +02:00
Laurent Destailleur
19adbaf84b Fix url to explorer no more working 2017-10-06 13:36:29 +02:00
Laurent Destailleur
777486d74c Keep usage of function dol_hash to encrypt a non encrypted data 2017-10-06 13:13:51 +02:00
Laurent Destailleur
2d549a6191 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 13:09:42 +02:00
Laurent Destailleur
4bc7eb0ec1 Merge pull request #7520 from hregis/develop_ldap 
Fix: Set LDAP password when LDAP key changed
 2017-10-06 13:09:28 +02:00
Laurent Destailleur
2148622d40 Clean code 2017-10-06 12:55:48 +02:00
Laurent Destailleur
ad12aff31d Merge pull request #7573 from inoveaconseil/patch-12 
Add constant to manage update_price function
 2017-10-06 12:48:55 +02:00
Laurent Destailleur
52582fb38d Merge pull request #7571 from hregis/develop_admin 
NEW add doActions hook in company admin
 2017-10-06 12:42:57 +02:00
Laurent Destailleur
cbe92242f3 Merge pull request #7574 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2017-10-06 12:42:18 +02:00
Laurent Destailleur
304828c37f Merge pull request #7569 from Dolibarr/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2017-10-06 12:41:52 +02:00
Scrutinizer Auto-Fixer
98d994f3d4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-06 10:41:36 +00:00
Laurent Destailleur
ef3d86333c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/activity/perday.php
 2017-10-06 12:38:50 +02:00
Laurent Destailleur
73f5d21ff8 Add button to make a leave request on the "leave" tab of user. 2017-10-06 12:36:11 +02:00
Laurent Destailleur
06b18a740e NEW Add date of birth on user card. 
NEW Show expected worked hours on the timesheet form.
 2017-10-06 12:08:01 +02:00
Rui Strecht
5a53e61940 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-06 10:06:47 +01:00
Laurent Destailleur
7871498724 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 11:03:03 +02:00
Laurent Destailleur
7b1fe6e5af Look and feel v6 2017-10-06 11:02:44 +02:00
Rui Strecht
1ea8bd2ed9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-06 09:58:33 +01:00
Laurent Destailleur
edacf6789b Remove dead code 2017-10-06 10:47:58 +02:00
Laurent Destailleur
848aadb48a FIX Do not lose selected id after ENTER the TAB on autocomplete 2017-10-06 10:47:02 +02:00
Inovea Conseil
2f3f04c2b1 Add constant to manage update_price function 
Some external module want no update price after a trigger because they have a other method to calculate the total (ex: with a extrafield).
 2017-10-06 10:42:25 +02:00
Neil Orley
c6c8344937 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-10-06 09:49:48 +02:00
Regis Houssin
e1311340a7 NEW add doActions hook in company admin 2017-10-06 08:45:59 +02:00
Scrutinizer Auto-Fixer
f59d87f06d Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-06 00:42:32 +00:00
Laurent Destailleur
67c571f952 Increase cyclomatic complexity threshold 2017-10-06 01:59:26 +02:00
Laurent Destailleur
337d6d9f08 Merge pull request #7565 from tarrsalah/fix_supplier_payment_builddoc 
Fix supplier payment builddoc
 2017-10-06 01:55:48 +02:00
Laurent Destailleur
e644d9d53f Fix syntax code 2017-10-06 01:49:07 +02:00
Laurent Destailleur
c06a78145c Rename function to avoid duplicate 2017-10-06 01:27:41 +02:00
Laurent Destailleur
801a5180d6 Fix scrutinizer bug reports 2017-10-06 01:16:19 +02:00
Regis Houssin
6adae89c47 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ldap

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-10-05 17:18:41 +02:00
Neil Orley
20395b749f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-10-05 13:28:01 +02:00
tarrsalah
7767f03e9c WIP: reuse actions_builddoc to build/remove supplier payment doc. 2017-10-05 10:44:08 +01:00
Laurent Destailleur
711bbe0afb FIX #7546 2017-10-05 11:09:09 +02:00
tarrsalah
76efc31b00 WIP fix supplier payement modelpath. 2017-10-05 09:51:17 +01:00
Laurent Destailleur
346c17b649 Merge pull request #7176 from atm-maxime/fix_member_search_pgsql 
Fix : search on rowid don't work with pgsql and natural search
 2017-10-05 10:39:17 +02:00
Laurent Destailleur
56acb2c08c Fix: with 5.0 and 6.0, supplier prices are always in main currency. The currency is not yet available in supplier prices. 
Field to define the currency of supplier prices were added in database but not yet used by screen/code.
 2017-10-05 10:38:58 +02:00
Laurent Destailleur
86e751bd45 Merge pull request #7563 from aspangaro/7.0-label_operation_on_general_ledger 
Fix : problems on accountancy & presentation
 2017-10-05 10:35:28 +02:00
Laurent Destailleur
ad63dc8b78 Merge pull request #7562 from hregis/develop_bug 
Fix: minimal num, maj and special character with value 0 not work
 2017-10-05 10:29:28 +02:00
Laurent Destailleur
f0b314dfd7 Change signature of file to match other urls to link/download files. 2017-10-05 10:25:06 +02:00
Laurent Destailleur
1cacfe4935 Merge pull request #7560 from Oeris/develop-api 
NEW Generates the document before downloading using REST API
 2017-10-05 10:04:08 +02:00
Laurent Destailleur
2a2cd30e19 Fix code 2017-10-05 10:00:43 +02:00
Laurent Destailleur
4730611333 Add language file button 2017-10-05 09:54:48 +02:00
Laurent Destailleur
04a56d4bd9 Fix phpunit 2017-10-05 09:34:09 +02:00
Alexandre SPANGARO
2f49b00f6c Fix : some small problems on accountancy 2017-10-05 06:56:13 +02:00