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
Kjeld Borch Egevang
ee99483b0d Changed "Solde" to "Balance". 2017-09-18 22:30:08 +02:00
Rui Strecht
7848d99b2c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-18 16:42:40 +01:00
arnaud
e7bb7a3588 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element 2017-09-18 17:28:03 +02:00
arnaud
9795f48046 NEW comment system working with all objects 2017-09-18 17:27:29 +02:00
Regis Houssin
cdd1473cfa Fix: avoid Warning: A non-numeric value encountered 2017-09-18 16:30:01 +02:00
Laurent Destailleur
70b11f18b5 FIX #7367 2017-09-18 16:06:58 +02:00
Laurent Destailleur
c11ff4a18c FIX #7368 2017-09-18 15:55:25 +02:00
Laurent Destailleur
aba907d1a8 FIX #7420 2017-09-18 15:49:21 +02:00
Laurent Destailleur
0c01c7ceba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-18 15:48:18 +02:00
Laurent Destailleur
6ac1b6e82e Fix template 2017-09-18 15:48:04 +02:00
Laurent Destailleur
0536d6cbed FIX #7330 2017-09-18 15:46:17 +02:00
Laurent Destailleur
278bcfa8da FIX #7148 2017-09-18 15:31:22 +02:00
Laurent Destailleur
52ebdcc27f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-09-18 15:25:51 +02:00
Laurent Destailleur
4c97f5514d FIX #7366 renaming table with pgsql 2017-09-18 15:25:21 +02:00
Laurent Destailleur
c6f7687bbb Merge pull request #7423 from tuxgasy/5.0_stock_supports_services_fix 
FIX Allow create shipping if STOCK_SUPPORTS_SERVICES option is enabled
 2017-09-18 15:09:30 +02:00
Laurent Destailleur
8536d0f6e9 Merge pull request #7421 from atm-florian/6.0 
fix : little fix
 2017-09-18 15:08:02 +02:00
Laurent Destailleur
da6b1e92b2 NEW Add the total in the perday view of the time spent form. 2017-09-18 14:18:34 +02:00
TuxGasy
4043141ae3 Allow create shipping if STOCK_SUPPORTS_SERVICES option is enabled 2017-09-18 14:11:21 +02:00
Rui Strecht
e74f4b8b11 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-18 12:25:54 +01:00
Laurent Destailleur
85d59b32b3 Add timespent entry into HR top menu too 
Faster update of total of timespent
 2017-09-18 13:15:24 +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
Laurent Destailleur
1760972166 Merge pull request #7419 from hregis/develop_trad 
Fix: wrong image url and file not present
 2017-09-18 11:43:21 +02:00
Rui Strecht
0e1772cf66 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-18 10:43:05 +01:00
Laurent Destailleur
230644070b Better detection of log to include merge labels 2017-09-18 11:42:05 +02:00
florian HENRY
31721165b5 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2017-09-18 11:36:45 +02:00
Laurent Destailleur
cc1b7c06ef Merge pull request #7417 from defrance/patch-27 
NEW Can add link to other element on a donation
 2017-09-18 11:17:40 +02:00
Laurent Destailleur
594e13180a Merge pull request #7415 from azawawi/develop 
Fix example comment typo
 2017-09-18 11:16:55 +02:00
Laurent Destailleur
0355b0d9ed Merge pull request #7414 from aspangaro/7.0-4 
Accountancy - Finish moving admin to specific menu & some cleaning
 2017-09-18 11:16:36 +02:00
Regis Houssin
bb0cb8adf4 Fix: remove unused file 2017-09-18 11:04:55 +02:00
Laurent Destailleur
dff4249e97 NEW Can include extrafields into member card templates 2017-09-18 10:48:49 +02:00
Regis Houssin
8389555882 Fix: wrong image url and file not present 2017-09-18 10:33:54 +02:00
Maxime Kohlhaas
5383df5246 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-09-18 09:58:15 +02:00
Regis Houssin
a03ef95eaa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql
 2017-09-18 09:11:04 +02:00
Laurent Destailleur
291a0d46e6 Fix edit of categories 2017-09-18 01:39:39 +02:00
Laurent Destailleur
3f7b705674 Use correct term accounting for codes 2017-09-18 00:48:09 +02:00
Laurent Destailleur
aea7318fae Fix search on ref customer 2017-09-18 00:07:00 +02:00
Laurent Destailleur
d1fd1df345 Add column position on some dictionaries table 2017-09-17 22:52:29 +02:00
Laurent Destailleur
eaee8ee586 Fix box activity again 2017-09-17 21:30:27 +02:00
Laurent Destailleur
f76b675e09 Fix box activity again 2017-09-17 21:30:15 +02:00
Laurent Destailleur
99149b5cfe Fix box activity again 2017-09-17 21:30:11 +02:00
Laurent Destailleur
90ab6a1f30 Fix box activity again 2017-09-17 21:29:25 +02:00
Laurent Destailleur
f4b8489bd6 Fix box activity again 2017-09-17 21:24:30 +02:00
Laurent Destailleur
0ed5b329a7 Fix box activity again 2017-09-17 21:21:12 +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
196c5c1267 Missing translation 2017-09-17 20:51:06 +02:00
Laurent Destailleur
2c3428a1bf Fix css 2017-09-17 20:48:09 +02:00
BENKE Charlene
ae2e0a70ae Update card.php 2017-09-17 20:45:00 +02:00
BENKE Charlene
7ee0b1061b Link feature on donation 2017-09-17 20:43:42 +02:00
Laurent Destailleur
94368accc1 Fix activity box 2017-09-17 20:37:18 +02:00
Laurent Destailleur
fb15b2aab0 Fix activity box 2017-09-17 20:36:45 +02:00